diff options
| author | Tejun Heo <tj@kernel.org> | 2022-09-23 07:19:38 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2022-09-23 07:19:38 -1000 |
| commit | 026e14a276c67c8433ecb10e557f0ba23d2b6636 (patch) | |
| tree | 8f57de61bfe542eebbf26f38f237e57f4850cec1 /kernel/bpf/reuseport_array.c | |
| parent | c478bd88362418bd2a1c230215fde184f5642e44 (diff) | |
| parent | df02452f3df069a59bc9e69c84435bf115cb6e37 (diff) | |
Merge branch 'for-6.0-fixes' into for-6.1
for-6.0 has the following fix for cgroup_get_from_id().
836ac87d ("cgroup: fix cgroup_get_from_id")
which conflicts with the following two commits in for-6.1.
4534dee9 ("cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id")
fa7e439c ("cgroup: Homogenize cgroup_get_from_id() return value")
While the resolution is straightforward, the code ends up pretty ugly
afterwards. Let's pull for-6.0-fixes into for-6.1 so that the code can be
fixed up there.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/bpf/reuseport_array.c')
| -rw-r--r-- | kernel/bpf/reuseport_array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/reuseport_array.c b/kernel/bpf/reuseport_array.c index 85fa9dbfa8bf..82c61612f382 100644 --- a/kernel/bpf/reuseport_array.c +++ b/kernel/bpf/reuseport_array.c @@ -24,7 +24,7 @@ void bpf_sk_reuseport_detach(struct sock *sk) struct sock __rcu **socks; write_lock_bh(&sk->sk_callback_lock); - socks = __rcu_dereference_sk_user_data_with_flags(sk, SK_USER_DATA_BPF); + socks = __locked_read_sk_user_data_with_flags(sk, SK_USER_DATA_BPF); if (socks) { WRITE_ONCE(sk->sk_user_data, NULL); /* |