diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 02:28:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 02:28:59 +0200 |
| commit | 0a68a20cc3eafa73bb54097c28b921147d7d3685 (patch) | |
| tree | 8e5f315226b618cb8e050a0c7653c8ec134501e3 /net/dccp/ipv4.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| parent | dccp ccid-3: Preventing Oscillations (diff) | |
| download | linux-0a68a20cc3eafa73bb54097c28b921147d7d3685.tar.xz linux-0a68a20cc3eafa73bb54097c28b921147d7d3685.zip | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
Conflicts:
net/dccp/input.c
net/dccp/options.c
Diffstat (limited to 'net/dccp/ipv4.c')
| -rw-r--r-- | net/dccp/ipv4.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 882c5c4de69e..b623f6b25482 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -545,6 +545,7 @@ out: static void dccp_v4_reqsk_destructor(struct request_sock *req) { + dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg); kfree(inet_rsk(req)->opt); } @@ -595,7 +596,8 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) if (req == NULL) goto drop; - dccp_reqsk_init(req, skb); + if (dccp_reqsk_init(req, dccp_sk(sk), skb)) + goto drop_and_free; dreq = dccp_rsk(req); if (dccp_parse_options(sk, dreq, skb)) |