diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-13 13:51:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-15 11:49:55 +0100 |
| commit | 1a0008f9df59451d0a17806c1ee1a19857032fa8 (patch) | |
| tree | d93827da3a980e7b01c4f9cbb920d9ea02a4be55 /include/net/inet_sock.h | |
| parent | 85d0b4dbd74b95cc492b1f4e34497d3f894f5d9a (diff) | |
| download | linux-rpi-1a0008f9df59451d0a17806c1ee1a19857032fa8.tar.gz linux-rpi-1a0008f9df59451d0a17806c1ee1a19857032fa8.tar.bz2 linux-rpi-1a0008f9df59451d0a17806c1ee1a19857032fa8.zip | |
tcp/dccp: Fix a data-race around sysctl_tcp_fwmark_accept.
While reading sysctl_tcp_fwmark_accept, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its reader.
Fixes: 84f39b08d786 ("net: support marking accepting TCP sockets")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 68d337775564..b29108f0973a 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -107,7 +107,8 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk) static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb) { - if (!sk->sk_mark && sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept) + if (!sk->sk_mark && + READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept)) return skb->mark; return sk->sk_mark; |