summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-08-23 10:46:50 -0700
committerDavid S. Miller <davem@davemloft.net>2022-08-24 13:46:58 +0100
commitd2154b0afa73c0159b2856f875c6b4fe7cf6a95e (patch)
tree5e0389d5b0c6ec8db433c8d871a5e7bafe8cf65b /net
parent7de6d09f51917c829af2b835aba8bb5040f8e86a (diff)
downloadlwn-d2154b0afa73c0159b2856f875c6b4fe7cf6a95e.tar.gz
lwn-d2154b0afa73c0159b2856f875c6b4fe7cf6a95e.zip
net: Fix a data-race around sysctl_tstamp_allow_data.
While reading sysctl_tstamp_allow_data, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: b245be1f4db1 ("net-timestamp: no-payload only sysctl") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5ea1d074a920..84bb5e188d0d 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4797,7 +4797,7 @@ static bool skb_may_tx_timestamp(struct sock *sk, bool tsonly)
{
bool ret;
- if (likely(sysctl_tstamp_allow_data || tsonly))
+ if (likely(READ_ONCE(sysctl_tstamp_allow_data) || tsonly))
return true;
read_lock_bh(&sk->sk_callback_lock);