aboutsummaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorGravatar Jakub Kicinski <jakub.kicinski@netronome.com> 2019-08-30 12:25:47 +0200
committerGravatar David S. Miller <davem@davemloft.net> 2019-08-31 23:44:28 -0700
commit15a7dea750e0162f273c6e61a94f96944b75b31e (patch)
tree3d5d9bed6fd3f7e42183e803c1540895d89c4b71 /net/core
parentMerge branch 'qed-Enhancements' (diff)
downloadlinux-15a7dea750e0162f273c6e61a94f96944b75b31e.tar.gz
linux-15a7dea750e0162f273c6e61a94f96944b75b31e.tar.bz2
linux-15a7dea750e0162f273c6e61a94f96944b75b31e.zip
net/tls: use RCU protection on icsk->icsk_ulp_data
We need to make sure context does not get freed while diag code is interrogating it. Free struct tls_context with kfree_rcu(). We add the __rcu annotation directly in icsk, and cast it away in the datapath accessor. Presumably all ULPs will do a similar thing. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 1330a7442e5b..01998860afaa 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -345,7 +345,7 @@ static int sock_map_update_common(struct bpf_map *map, u32 idx,
return -EINVAL;
if (unlikely(idx >= map->max_entries))
return -E2BIG;
- if (unlikely(icsk->icsk_ulp_data))
+ if (unlikely(rcu_access_pointer(icsk->icsk_ulp_data)))
return -EINVAL;
link = sk_psock_init_link();