mirror of
https://github.com/torvalds/linux.git
synced 2026-06-06 21:45:45 +02:00
net: Fix a data-race around sysctl_tstamp_allow_data.
[ Upstream commitd2154b0afa] While reading sysctl_tstamp_allow_data, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes:b245be1f4d("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>
This commit is contained in:
parent
ed48223f87
commit
8db070463e
|
|
@ -4691,7 +4691,7 @@ static bool skb_may_tx_timestamp(struct sock *sk, bool tsonly)
|
||||||
{
|
{
|
||||||
bool ret;
|
bool ret;
|
||||||
|
|
||||||
if (likely(sysctl_tstamp_allow_data || tsonly))
|
if (likely(READ_ONCE(sysctl_tstamp_allow_data) || tsonly))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
read_lock_bh(&sk->sk_callback_lock);
|
read_lock_bh(&sk->sk_callback_lock);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user