aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-09-08 15:44:47 -0400
committerDavid S. Miller <davem@davemloft.net>2017-09-08 19:07:17 -0400
commit1f3b359f1004bd34b7b0bad70b93e3c7af92a37b (patch)
tree40485d37c352b90d936c2c95239ea9d4e7d2f140 /net/ipv4/tcp_ipv4.c
parent108074611015bccfaf9ef50710edfd6929e55cd3 (diff)
tcp: fix a request socket leak
While the cited commit fixed a possible deadlock, it added a leak of the request socket, since reqsk_put() must be called if the BPF filter decided the ACK packet must be dropped. Fixes: d624d276d1dd ("tcp: fix possible deadlock in TCP stack vs BPF filter") Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a63486afa7a7..d9416b5162bc 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1669,9 +1669,9 @@ process:
1669 */ 1669 */
1670 sock_hold(sk); 1670 sock_hold(sk);
1671 refcounted = true; 1671 refcounted = true;
1672 if (tcp_filter(sk, skb)) 1672 nsk = NULL;
1673 goto discard_and_relse; 1673 if (!tcp_filter(sk, skb))
1674 nsk = tcp_check_req(sk, skb, req, false); 1674 nsk = tcp_check_req(sk, skb, req, false);
1675 if (!nsk) { 1675 if (!nsk) {
1676 reqsk_put(req); 1676 reqsk_put(req);
1677 goto discard_and_relse; 1677 goto discard_and_relse;