shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge cae9d2b162 ("tcp: fix races in tcp_abort()") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.132

Change-Id: I08d48009db654a028a94cbe2285c1ea5de1ef8c5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-04-16 07:45:18 +00:00
parent e6079359f7 cae9d2b162
commit 1231f555d1
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

@@ -4739,13 +4739,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);