diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-06 20:33:09 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-06 21:06:56 +0200 |
| commit | 62b5bf58b928f0f4fcc8bb633b63795517825d31 (patch) | |
| tree | 7331b7fad6fd30251fff3ebbd095680a1db328dd /net/ipv6/route.c | |
| parent | Merge branch 'tcp-small-code-reorg' (diff) | |
| parent | Merge tag 'net-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-62b5bf58b928f0f4fcc8bb633b63795517825d31.tar.xz linux-62b5bf58b928f0f4fcc8bb633b63795517825d31.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/pensando/ionic/ionic_txrx.c
d9c04209990b ("ionic: Mark error paths in the data path as unlikely")
491aee894a08 ("ionic: fix kernel panic in XDP_TX action")
net/ipv6/ip6_fib.c
b4cb4a1391dc ("net: use unrcu_pointer() helper")
b01e1c030770 ("ipv6: fix possible race in __fib6_drop_pcpu_from()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index ec5b59b221ef..ad5fff5a210c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1407,6 +1407,7 @@ static struct rt6_info *rt6_get_pcpu_route(const struct fib6_result *res) struct rt6_info *prev, **p; p = this_cpu_ptr(res->nh->rt6i_pcpu); + /* Paired with READ_ONCE() in __fib6_drop_pcpu_from() */ prev = xchg(p, NULL); if (prev) { dst_dev_put(&prev->dst); |