mld: respect RCU rules in ip6_mc_source() and ip6_mc_msfilter()
Subsystems (3)
PATCH 1/1 mld: respect RCU rules in ip6_mc_source() and ip6_mc_msfilter()
From: Eric Dumazet <[email protected]>
Whenever RCU protected list replaces an object,
the pointer to the new object needs to be updated
_before_ the call to kfree_rcu() or call_rcu()
Also ip6_mc_msfilter() needs to update the pointer before releasing the mc_lock mutex.
Note that linux-5.13 was supporting kfree_rcu(NULL, rcu), so this fix does not need the conditional test I was forced to use in the equivalent patch for IPv4.
--- net/ipv6/mcast.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv6/mcast.c +4 -4
@@ -460,10 +460,10 @@ int ip6_mc_source(int add, int omode, struct sock *sk, newpsl->sl_addr[i] = psl->sl_addr[i];atomic_sub (struct_size (psl, sl_addr, psl->sl_max), &sk->sk_omem_alloc); -kfree_rcu (psl, rcu); } +rcu_assign_pointer (pmc->sflist, newpsl); +kfree_rcu (psl, rcu); psl = newpsl; -rcu_assign_pointer (pmc->sflist, psl); } rv =1 ;/* > 0 for insert logic below if sl_count is 0 */ for (i =0 ; i < psl->sl_count; i++) {
@@ -565,12 +565,12 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf, psl->sl_count, psl->sl_addr, 0);atomic_sub (struct_size (psl, sl_addr, psl->sl_max), &sk->sk_omem_alloc); -kfree_rcu (psl, rcu); }else {ip6_mc_del_src (idev, group, pmc->sfmode,0 ,NULL ,0 ); } -mutex_unlock (&idev->mc_lock);rcu_assign_pointer (pmc->sflist, newpsl); +mutex_unlock (&idev->mc_lock); +kfree_rcu (psl, rcu); pmc->sfmode = gsf->gf_fmode; err =0 ; done:
Signature · 1 line
2.36.0.464.gb9c8b46e94-goog
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 10 lines · On Fri, 29 Apr 2022 09:20:36 -0700 you wrote:
From: Eric Dumazet <[email protected]>
Whenever RCU protected list replaces an object,
the pointer to the new object needs to be updated
_before_ the call tokfree_rcu()orcall_rcu()Also
ip6_mc_msfilter()needs to update the pointer before releasing themc_lockmutex.[...]
Here is the summary with links:
- [net] mld: respect RCU rules in ip6_mc_source() and ip6_mc_msfilter()
https://git.kernel.org/netdev/net/c/a9384a4c1d25
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html