NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp_bpf: properly release resources on error paths

Browse source 
[ Upstream commit 68b54aeff804acceb02f228ea2e28419272c1fb9 ]

In the blamed commit below, I completely forgot to release the acquired
resources before erroring out in the TCP BPF code, as reported by Dan.

Address the issues by replacing the bogus return with a jump to the
relevant cleanup code.

Fixes: 419ce133ab92 ("tcp: allow again tcp_disconnect() when threads are waiting")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/8f99194c698bcef12666f0a9a999c58f8b1cb52c.1697557782.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Paolo Abeni 2023-10-17 17:49:51 +02:00 • committed by Greg Kroah-Hartman
parent c3e70048ac
commit 2efcdbef13
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
net/ipv4/tcp_bpf.c
View file

@ -302,8 +302,10 @@ msg_bytes_ready:
} }
data = tcp_msg_wait_data(sk, psock, timeo); data = tcp_msg_wait_data(sk, psock, timeo);
if (data < 0) if (data < 0) {
return data; copied = data;
goto unlock;
}
if (data && !sk_psock_queue_empty(psock)) if (data && !sk_psock_queue_empty(psock))
goto msg_bytes_ready; goto msg_bytes_ready;
copied = -EAGAIN; copied = -EAGAIN;
@ -314,6 +316,8 @@ out:
tcp_rcv_space_adjust(sk); tcp_rcv_space_adjust(sk);
if (copied > 0) if (copied > 0)
__tcp_cleanup_rbuf(sk, copied); __tcp_cleanup_rbuf(sk, copied);
unlock:
release_sock(sk); release_sock(sk);
sk_psock_put(sk, psock); sk_psock_put(sk, psock);
return copied; return copied;
@ -348,8 +352,10 @@ msg_bytes_ready:
timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
data = tcp_msg_wait_data(sk, psock, timeo); data = tcp_msg_wait_data(sk, psock, timeo);
if (data < 0) if (data < 0) {
return data; ret = data;
goto unlock;
}
if (data) { if (data) {
if (!sk_psock_queue_empty(psock)) if (!sk_psock_queue_empty(psock))
goto msg_bytes_ready; goto msg_bytes_ready;
@ -360,6 +366,8 @@ msg_bytes_ready:
copied = -EAGAIN; copied = -EAGAIN;
} }
ret = copied; ret = copied;
unlock:
release_sock(sk); release_sock(sk);
sk_psock_put(sk, psock); sk_psock_put(sk, psock);
return ret; return ret;