diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-23 16:09:58 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-23 16:09:58 -0800 |
| commit | 8b3f91332291fa280a56215f5189baca185998f5 (patch) | |
| tree | b89f58972c80ffacf57c4c9cedb5b4b03473c5be /net/ipv4/af_inet.c | |
| parent | f2b551fad8d8f2ac5e1f810ad595298381e0b0c5 (diff) | |
| parent | 391e5975c0208ce3739587b33eba08be3e473d79 (diff) | |
| download | linux-8b3f91332291fa280a56215f5189baca185998f5.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
commit 8f905c0e7354 ("inet: fully convert sk->sk_rx_dst to RCU rules")
commit 43f51df41729 ("net: move early demux fields close to sk_refcnt")
https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 04067b249bf3..5d18d32557d2 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -155,7 +155,7 @@ void inet_sock_destruct(struct sock *sk) kfree(rcu_dereference_protected(inet->inet_opt, 1)); dst_release(rcu_dereference_protected(sk->sk_dst_cache, 1)); - dst_release(sk->sk_rx_dst); + dst_release(rcu_dereference_protected(sk->sk_rx_dst, 1)); sk_refcnt_debug_dec(sk); } EXPORT_SYMBOL(inet_sock_destruct); |