diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-06-14 09:55:46 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-06-14 09:55:46 +0200 |
| commit | 14731a640e5513bd514adcf35e96c84ad42f540d (patch) | |
| tree | ab909e6f1506c1d2cff57fbb86a1d6f295b1b413 /net/ipv6/ip6_fib.c | |
| parent | 41f590e31c6c8b8a0a490b7c1ad2e57c20ec3d9b (diff) | |
| parent | f1909e859753c9bda87c6d2b82a7f832ef80aa2d (diff) | |
Merge drm/drm-fixes into drm-misc-fixesdrm-misc-fixes-2024-06-14
Roll -rc3 and current drm/fixes in.
This will also unstuck our for-next branch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 31d77885bcae..6e57c03e3255 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -966,6 +966,7 @@ static void __fib6_drop_pcpu_from(struct fib6_nh *fib6_nh, if (!fib6_nh->rt6i_pcpu) return; + rcu_read_lock(); /* release the reference to this fib entry from * all of its cached pcpu routes */ @@ -974,7 +975,9 @@ static void __fib6_drop_pcpu_from(struct fib6_nh *fib6_nh, struct rt6_info *pcpu_rt; ppcpu_rt = per_cpu_ptr(fib6_nh->rt6i_pcpu, cpu); - pcpu_rt = *ppcpu_rt; + + /* Paired with xchg() in rt6_get_pcpu_route() */ + pcpu_rt = READ_ONCE(*ppcpu_rt); /* only dropping the 'from' reference if the cached route * is using 'match'. The cached pcpu_rt->from only changes @@ -988,6 +991,7 @@ static void __fib6_drop_pcpu_from(struct fib6_nh *fib6_nh, fib6_info_release(from); } } + rcu_read_unlock(); } struct fib6_nh_pcpu_arg { |