diff mbox series

net: mark racy access on sk->sk_rcvbuf

Message ID tencent_DC4901C65DB41D86CD613F3ACC41EA143808@qq.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series net: mark racy access on sk->sk_rcvbuf | expand

Checks

Context Check Description
netdev/series_format warning Single patches do not need cover letters; Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 946 this patch: 946
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 4 of 4 maintainers
netdev/build_clang success Errors and warnings before: 957 this patch: 957
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 962 this patch: 962
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-03-10--00-00 (tests: 888)

Commit Message

linke li March 9, 2024, 1:34 p.m. UTC
sk->sk_rcvbuf can be changed by other threads. Mark this as benign using
READ_ONCE. 

This patch is aimed at reducing the number of benign races reported by
KCSAN in order to focus future debugging effort on harmful races.

Signed-off-by: linke li <lilinke99@qq.com>
---
 net/core/sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Dumazet March 9, 2024, 1:50 p.m. UTC | #1
On Sat, Mar 9, 2024 at 2:35 PM linke li <lilinke99@qq.com> wrote:
>
> sk->sk_rcvbuf can be changed by other threads. Mark this as benign using
> READ_ONCE.
>
> This patch is aimed at reducing the number of benign races reported by
> KCSAN in order to focus future debugging effort on harmful races.
>
> Signed-off-by: linke li <lilinke99@qq.com>
> ---
>  net/core/sock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/sock.c b/net/core/sock.c
> index 5e78798456fd..4c5524e70534 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -551,7 +551,7 @@ int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,
>
>         skb->dev = NULL;
>
> -       if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
> +       if (sk_rcvqueues_full(sk, READ_ONCE(sk->sk_rcvbuf))) {
>                 atomic_inc(&sk->sk_drops);
>                 goto discard_and_relse;

OK, but what about __sock_queue_rcv_skb() in the same file ?
linke li March 9, 2024, 1:59 p.m. UTC | #2
> OK, but what about __sock_queue_rcv_skb() in the same file ?

I notice that, but I am not very sure whether there is a data race. If it
is a similar situation, then the same patch should be applied too.
Jason Xing March 9, 2024, 2:49 p.m. UTC | #3
On Sat, Mar 9, 2024 at 10:10 PM linke li <lilinke99@qq.com> wrote:
>
> > OK, but what about __sock_queue_rcv_skb() in the same file ?
>
> I notice that, but I am not very sure whether there is a data race. If it
> is a similar situation, then the same patch should be applied too.

During that process, I see no lock owning the socket, so sk->sk_rcvbuf
should also be read locklessly.

Thanks,
Jason

>
>
diff mbox series

Patch

diff --git a/net/core/sock.c b/net/core/sock.c
index 5e78798456fd..4c5524e70534 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -551,7 +551,7 @@  int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,
 
 	skb->dev = NULL;
 
-	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
+	if (sk_rcvqueues_full(sk, READ_ONCE(sk->sk_rcvbuf))) {
 		atomic_inc(&sk->sk_drops);
 		goto discard_and_relse;
 	}