tcp: fix a request socket leak (1f3b359f) · Commits · 戴 / test

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: ("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>

net/ipv4/tcp_ipv4.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1669,8 +1669,8 @@ process:
		*/
		sock_hold(sk);
		refcounted = true;
		if (tcp_filter(sk, skb))
		goto discard_and_relse;
		nsk = NULL;
		if (!tcp_filter(sk, skb))
		nsk = tcp_check_req(sk, skb, req, false);
		if (!nsk) {
		reqsk_put(req);

net/ipv6/tcp_ipv6.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1460,8 +1460,8 @@ process:
		}
		sock_hold(sk);
		refcounted = true;
		if (tcp_filter(sk, skb))
		goto discard_and_relse;
		nsk = NULL;
		if (!tcp_filter(sk, skb))
		nsk = tcp_check_req(sk, skb, req, false);
		if (!nsk) {
		reqsk_put(req);

Admin message