Commit 35c2f174 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman

tcp: fix a request socket leak


[ Upstream commit 1f3b359f ]

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: d624d276 ("tcp: fix possible deadlock in TCP stack vs BPF filter")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b97e138
...@@ -1722,9 +1722,9 @@ int tcp_v4_rcv(struct sk_buff *skb) ...@@ -1722,9 +1722,9 @@ int tcp_v4_rcv(struct sk_buff *skb)
*/ */
sock_hold(sk); sock_hold(sk);
refcounted = true; refcounted = true;
if (tcp_filter(sk, skb)) nsk = NULL;
goto discard_and_relse; if (!tcp_filter(sk, skb))
nsk = tcp_check_req(sk, skb, req, false); nsk = tcp_check_req(sk, skb, req, false);
if (!nsk) { if (!nsk) {
reqsk_put(req); reqsk_put(req);
goto discard_and_relse; goto discard_and_relse;
......
...@@ -1456,9 +1456,9 @@ static int tcp_v6_rcv(struct sk_buff *skb) ...@@ -1456,9 +1456,9 @@ static int tcp_v6_rcv(struct sk_buff *skb)
} }
sock_hold(sk); sock_hold(sk);
refcounted = true; refcounted = true;
if (tcp_filter(sk, skb)) nsk = NULL;
goto discard_and_relse; if (!tcp_filter(sk, skb))
nsk = tcp_check_req(sk, skb, req, false); nsk = tcp_check_req(sk, skb, req, false);
if (!nsk) { if (!nsk) {
reqsk_put(req); reqsk_put(req);
goto discard_and_relse; goto discard_and_relse;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment