diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-13 13:51:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-29 17:10:31 +0200 |
| commit | abf70de2ec026ae8d7da4e79bec61888a880e00b (patch) | |
| tree | c164ab7b32e11ebd38902cedefe8b490f10db6cd | |
| parent | 9096edcf4854289f92252e086cf6e498c7f8c21d (diff) | |
| download | linux-stable-abf70de2ec026ae8d7da4e79bec61888a880e00b.tar.gz linux-stable-abf70de2ec026ae8d7da4e79bec61888a880e00b.tar.bz2 linux-stable-abf70de2ec026ae8d7da4e79bec61888a880e00b.zip | |
tcp/dccp: Fix a data-race around sysctl_tcp_fwmark_accept.
[ Upstream commit 1a0008f9df59451d0a17806c1ee1a19857032fa8 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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 e3d943813ff8..d5552ff1d361 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -111,7 +111,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; |