diff options
| author |  Eric Dumazet <edumazet@google.com>
| 2023-08-16 08:15:35 +0000 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2023-08-16 11:09:17 +0100 |
| commit | 6b5f43ea08150e7ff72f734545101c58489ead5b (patch) | |
| tree | 805b596ad9e4070ad6766a0e11b601d9a88edbac /net/ipv4/tcp_ipv4.c | |
| parent | inet: set/get simple options locklessly (diff) | |
| download | linux-6b5f43ea08150e7ff72f734545101c58489ead5b.tar.gz linux-6b5f43ea08150e7ff72f734545101c58489ead5b.tar.bz2 linux-6b5f43ea08150e7ff72f734545101c58489ead5b.zip | |
inet: move inet->recverr to inet->inet_flags
IP_RECVERR socket option can now be set/get without locking the socket.
This patch potentially avoid data-races around inet->recverr.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 5b18a048f613..2a662d5f3072 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -477,7 +477,6 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) const struct iphdr *iph = (const struct iphdr *)skb->data; struct tcphdr *th = (struct tcphdr *)(skb->data + (iph->ihl << 2)); struct tcp_sock *tp; - struct inet_sock *inet; const int type = icmp_hdr(skb)->type; const int code = icmp_hdr(skb)->code; struct sock *sk; @@ -625,8 +624,8 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) * --ANK (980905) */ - inet = inet_sk(sk); - if (!sock_owned_by_user(sk) && inet->recverr) { + if (!sock_owned_by_user(sk) && + inet_test_bit(RECVERR, sk)) { WRITE_ONCE(sk->sk_err, err); sk_error_report(sk); } else { /* Only an error on timeout */ |