diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-25 17:35:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-25 17:35:03 -0700 |
| commit | 28ba934d28cf46c1ea92f6aff28e8d9ec52e194e (patch) | |
| tree | 821fd2b12068195842b6d95acf3c5eaac605fcd3 /net/core/skmsg.c | |
| parent | 47d858d0bdcd47cc1c6c9eeca91b091dd9e55637 (diff) | |
| parent | cb8ffde5694ae5fffb456eae932aac442aa3a207 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-07-25
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix segfault in libbpf, from Andrii.
2) fix gso_segs access, from Eric.
3) tls/sockmap fixes, from Jakub and John.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skmsg.c')
| -rw-r--r-- | net/core/skmsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 93bffaad2135..6832eeb4b785 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -585,12 +585,12 @@ EXPORT_SYMBOL_GPL(sk_psock_destroy); void sk_psock_drop(struct sock *sk, struct sk_psock *psock) { - rcu_assign_sk_user_data(sk, NULL); sk_psock_cork_free(psock); sk_psock_zap_ingress(psock); - sk_psock_restore_proto(sk, psock); write_lock_bh(&sk->sk_callback_lock); + sk_psock_restore_proto(sk, psock); + rcu_assign_sk_user_data(sk, NULL); if (psock->progs.skb_parser) sk_psock_stop_strp(sk, psock); write_unlock_bh(&sk->sk_callback_lock); |