diff options
| author | Eric Dumazet <[email protected]> | 2024-05-28 12:52:53 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-05-30 00:21:36 +0000 |
| commit | fde6f897f2a184546bf5516ac736523ef24dc6a7 (patch) | |
| tree | fc8014baaf67f7eb33fa5249a7c068a43438c7cc /net/ipv6/tcp_ipv6.c | |
| parent | tcp: fix races in tcp_abort() (diff) | |
| download | kernel-fde6f897f2a184546bf5516ac736523ef24dc6a7.tar.gz kernel-fde6f897f2a184546bf5516ac736523ef24dc6a7.zip | |
tcp: fix races in tcp_v[46]_err()
These functions have races when they:
1) Write sk->sk_err
2) call sk_error_report(sk)
3) call tcp_done(sk)
As described in prior patches in this series:
An smp_wmb() is missing.
We should call tcp_done() before sk_error_report(sk)
to have consistent tcp_poll() results on SMP hosts.
Use tcp_done_with_error() where we centralized the
correct sequence.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Eric Dumazet <[email protected]>
Acked-by: Neal Cardwell <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 750aa681779c..1ac7502e1bf5 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -490,14 +490,10 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, ipv6_icmp_error(sk, skb, err, th->dest, ntohl(info), (u8 *)th); - if (!sock_owned_by_user(sk)) { - WRITE_ONCE(sk->sk_err, err); - sk_error_report(sk); /* Wake people up to see the error (see connect in sock.c) */ - - tcp_done(sk); - } else { + if (!sock_owned_by_user(sk)) + tcp_done_with_error(sk, err); + else WRITE_ONCE(sk->sk_err_soft, err); - } goto out; case TCP_LISTEN: break; |