openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: prevent load/store tearing on sk->sk_stamp 

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: 3a0ed3e961 ("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>
This commit is contained in:
Eric Dumazet 2019-11-04 21:38:43 -08:00 committed by David S. Miller
parent e7a86c687e
commit f75359f3ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/sock.h
View File

@ -2342,7 +2342,7 @@ static inline ktime_t sock_read_timestamp(struct sock *sk)
return kt; return kt;
#else #else
return sk->sk_stamp; return READ_ONCE(sk->sk_stamp);
#endif #endif
} }
@ -2353,7 +2353,7 @@ static inline void sock_write_timestamp(struct sock *sk, ktime_t kt)
sk->sk_stamp = kt; sk->sk_stamp = kt;
write_sequnlock(&sk->sk_stamp_seq); write_sequnlock(&sk->sk_stamp_seq);
#else #else
sk->sk_stamp = kt; WRITE_ONCE(sk->sk_stamp, kt);
#endif #endif
} }