diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-08-16 10:15:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-16 12:09:17 +0200 |
| commit | 6b5f43ea08150e7ff72f734545101c58489ead5b (patch) | |
| tree | 805b596ad9e4070ad6766a0e11b601d9a88edbac /net/dccp | |
| parent | inet: set/get simple options locklessly (diff) | |
| download | linux-6b5f43ea08150e7ff72f734545101c58489ead5b.tar.xz 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/dccp')
| -rw-r--r-- | net/dccp/ipv4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 8e919cfe6e23..8dd6837c476a 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -247,7 +247,6 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info) const u8 offset = iph->ihl << 2; const struct dccp_hdr *dh; struct dccp_sock *dp; - struct inet_sock *inet; const int type = icmp_hdr(skb)->type; const int code = icmp_hdr(skb)->code; struct sock *sk; @@ -361,8 +360,7 @@ static int dccp_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)) { sk->sk_err = err; sk_error_report(sk); } else { /* Only an error on timeout */ |