diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-16 00:52:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-16 00:52:27 -0700 |
| commit | a302afe980ca6b25b2bae0b5bc816fe1dc1bb039 (patch) | |
| tree | bf2c3efa6f72141e1824bcd075fcfcc250475476 /net/dccp/ipv4.c | |
| parent | 47ea0325337b166c1c8695119aa6e83cdc035ef5 (diff) | |
| parent | ebb516af60e18258aac8e80bbe068740ef1579ed (diff) | |
| download | linux-a302afe980ca6b25b2bae0b5bc816fe1dc1bb039.tar.bz2 | |
Merge branch 'robust_listener'
Eric Dumazet says:
====================
tcp/dccp: make our listener code more robust
This patch series addresses request sockets leaks and listener dismantle
phase. This survives a stress test with listeners being added/removed
quite randomly.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
| -rw-r--r-- | net/dccp/ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 0dcf1963b323..59bc180b02d8 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -208,7 +208,6 @@ void dccp_req_err(struct sock *sk, u64 seq) if (!between48(seq, dccp_rsk(req)->dreq_iss, dccp_rsk(req)->dreq_gss)) { NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); - reqsk_put(req); } else { /* * Still in RESPOND, just remove it silently. @@ -218,6 +217,7 @@ void dccp_req_err(struct sock *sk, u64 seq) */ inet_csk_reqsk_queue_drop(req->rsk_listener, req); } + reqsk_put(req); } EXPORT_SYMBOL(dccp_req_err); @@ -828,7 +828,7 @@ lookup: if (likely(sk->sk_state == DCCP_LISTEN)) { nsk = dccp_check_req(sk, skb, req); } else { - inet_csk_reqsk_queue_drop(sk, req); + inet_csk_reqsk_queue_drop_and_put(sk, req); goto lookup; } if (!nsk) { |