diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2008-06-10 12:39:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 12:39:35 -0700 |
| commit | ce4a7d0d48bbaed78ccbb0bafb9229651a40303a (patch) | |
| tree | df8770ef69c71a0d6935154add3ff3f4bb8dbc3a /net/dccp/ipv4.c | |
| parent | 45d465bc237ab1e1ebb4c65b9b318830dafb7509 (diff) | |
| download | kernel_goldelico_gta04-ce4a7d0d48bbaed78ccbb0bafb9229651a40303a.zip kernel_goldelico_gta04-ce4a7d0d48bbaed78ccbb0bafb9229651a40303a.tar.gz kernel_goldelico_gta04-ce4a7d0d48bbaed78ccbb0bafb9229651a40303a.tar.bz2 | |
inet{6}_request_sock: Init ->opt and ->pktopts in the constructor
Wei Yongjun noticed that we may call reqsk_free on request sock objects where
the opt fields may not be initialized, fix it by introducing inet_reqsk_alloc
where we initialize ->opt to NULL and set ->pktopts to NULL in
inet6_reqsk_alloc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
| -rw-r--r-- | net/dccp/ipv4.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index c22a378..37d27bc 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -589,7 +589,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) goto drop; - req = reqsk_alloc(&dccp_request_sock_ops); + req = inet_reqsk_alloc(&dccp_request_sock_ops); if (req == NULL) goto drop; @@ -605,7 +605,6 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) ireq = inet_rsk(req); ireq->loc_addr = ip_hdr(skb)->daddr; ireq->rmt_addr = ip_hdr(skb)->saddr; - ireq->opt = NULL; /* * Step 3: Process LISTEN state |