diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-01 15:28:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-01 15:28:07 -0800 |
| commit | e7b816415e031bf7879ffd234c5e4f4fcec13a74 (patch) | |
| tree | 7610edf8a5b800399bb92772a0309aba12a2ed74 /net/core/skmsg.c | |
| parent | 9b1f19d810e92d6cdc68455fbc22d9f961a58ce1 (diff) | |
| parent | f01c2803873e83ea5f1b160c3169ed6018704be8 (diff) | |
| download | linux-e7b816415e031bf7879ffd234c5e4f4fcec13a74.tar.gz linux-e7b816415e031bf7879ffd234c5e4f4fcec13a74.tar.bz2 linux-e7b816415e031bf7879ffd234c5e4f4fcec13a74.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-01-31
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) disable preemption in sender side of socket filters, from Alexei.
2) fix two potential deadlocks in syscall bpf lookup and prog_register,
from Martin and Alexei.
3) fix BTF to allow typedef on func_proto, from Yonghong.
4) two bpftool fixes, from Jiri and Paolo.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skmsg.c')
| -rw-r--r-- | net/core/skmsg.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/skmsg.c b/net/core/skmsg.c index d6d5c20d7044..8c826603bf36 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -545,8 +545,7 @@ static void sk_psock_destroy_deferred(struct work_struct *gc) struct sk_psock *psock = container_of(gc, struct sk_psock, gc); /* No sk_callback_lock since already detached. */ - if (psock->parser.enabled) - strp_done(&psock->parser.strp); + strp_done(&psock->parser.strp); cancel_work_sync(&psock->work); |