netdev - Re: [PATCH net 08/11] net: annotate data-races around sk->sk_mark

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <c2cd0101-85b5-39fc-801f-8a3eb0f8a0cb@tessares.net>
Date: Sun, 30 Jul 2023 09:44:42 +0200
From: Matthieu Baerts <matthieu.baerts@...sares.net>
To: Eric Dumazet <edumazet@...gle.com>, "David S . Miller"
 <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>
Cc: Jamal Hadi Salim <jhs@...atatu.com>, Cong Wang
 <xiyou.wangcong@...il.com>, Jiri Pirko <jiri@...nulli.us>,
 netdev@...r.kernel.org, eric.dumazet@...il.com,
 Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH net 08/11] net: annotate data-races around sk->sk_mark -
 manual merge

Hello,

On 28/07/2023 17:03, Eric Dumazet wrote:
> sk->sk_mark is often read while another thread could change the value.
> 
> Fixes: 4a19ec5800fc ("[NET]: Introducing socket mark socket option.")
> Signed-off-by: Eric Dumazet <edumazet@...gle.com>

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  3c5b4d69c358 ("net: annotate data-races around sk->sk_mark")

and this one from 'net-next':

  b7f72a30e9ac ("xsk: introduce wrappers and helpers for supporting
multi-buffer in Tx path")

Regarding this conflict, this is a trivial context-based one: I simply
took the modifications from the two versions.

Rerere cache is available in [2].

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/083975145b2e
[2] https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/0616
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
View attachment "083975145b2e4fcb837c9c0d694b8967bfa91271.patch" of type "text/x-patch" (728 bytes)