Commit 5da0632c authored Aug 23, 2022 by Kuniyuki Iwashima Committed by Greg Kroah-Hartman Sep 05, 2022

net: Fix a data-race around sysctl_tstamp_allow_data.



[ Upstream commit d2154b0afa73c0159b2856f875c6b4fe7cf6a95e ]

While reading sysctl_tstamp_allow_data, it can be changed
concurrently.  Thus, we need to add READ_ONCE() to its reader.

Fixes: b245be1f ("net-timestamp: no-payload only sysctl")
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>

parent 4482215f

net/core/skbuff.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4564,7 +4564,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);