samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BACKPORT: tcp: fix races in tcp_abort()

Browse Source 
tcp_abort() has the same issue than the one fixed in the prior patch
in tcp_write_err().

In order to get consistent results from tcp_poll(), we must call
sk_error_report() after tcp_done().

We can use tcp_done_with_error() to centralize this logic.

Fixes: c1e64e298b ("net: diag: Support destroying TCP sockets.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Link: https://lore.kernel.org/r/20240528125253.1966136-4-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20250314092446.852230-1-youngmin.nam@samsung.com
Bug: 381788344
Change-Id: I9d5ae8a9874e5b22e39d11695696cb2b850db8c8
(cherry picked from commit 5ce4645c23cf5f048eb8e9ce49e514bababdee85)
[youngmin: Resolved minor conflict in net/ipv4/tcp.c ]
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
This commit is contained in:
Eric Dumazet
2024-05-28 12:52:52 +00:00
committed by Carlos Llamas
parent d555ebb4da
commit a1b4999579
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/tcp.c
View File

@@ -4630,13 +4630,9 @@ int tcp_abort(struct sock *sk, int err)
bh_lock_sock(sk);
if (!sock_flag(sk, SOCK_DEAD)) {
WRITE_ONCE(sk->sk_err, err);
/* This barrier is coupled with smp_rmb() in tcp_poll() */
smp_wmb();
sk_error_report(sk);
if (tcp_need_reset(sk->sk_state))
tcp_send_active_reset(sk, GFP_ATOMIC);
tcp_done(sk);
tcp_done_with_error(sk, err);
}
bh_unlock_sock(sk);