lkml.org 
[lkml]   [2019]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 020/193] net: prevent load/store tearing on sk->sk_stamp
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit f75359f3ac855940c5718af10ba089b8977bf339 ]

    Add a couple of READ_ONCE() and WRITE_ONCE() to prevent
    load-tearing and store-tearing in sock_read_timestamp()
    and sock_write_timestamp()

    This might prevent another KCSAN report.

    Fixes: 3a0ed3e96197 ("sock: Make sock->sk_stamp thread-safe")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Deepa Dinamani <deepa.kernel@gmail.com>
    Acked-by: Deepa Dinamani <deepa.kernel@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/net/sock.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/net/sock.h
    +++ b/include/net/sock.h
    @@ -2331,7 +2331,7 @@ static inline ktime_t sock_read_timestam

    return kt;
    #else
    - return sk->sk_stamp;
    + return READ_ONCE(sk->sk_stamp);
    #endif
    }

    @@ -2342,7 +2342,7 @@ static inline void sock_write_timestamp(
    sk->sk_stamp = kt;
    write_sequnlock(&sk->sk_stamp_seq);
    #else
    - sk->sk_stamp = kt;
    + WRITE_ONCE(sk->sk_stamp, kt);
    #endif
    }


    \
     
     \ /
      Last update: 2019-11-11 19:49    [W:4.084 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site