lkml.org 
[lkml]   [2022]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 14/42] net: Fix a data-race around sysctl_tstamp_allow_data.
    Date
    From: Kuniyuki Iwashima <kuniyu@amazon.com>

    [ 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: b245be1f4db1 ("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>
    ---
    net/core/skbuff.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/core/skbuff.c b/net/core/skbuff.c
    index 629997753f69b..11d0ffc51c24a 100644
    --- a/net/core/skbuff.c
    +++ b/net/core/skbuff.c
    @@ -4352,7 +4352,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);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-02 14:26    [W:2.118 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site