diff options
| author |   John Fastabend <john.fastabend@gmail.com> | 2018-12-20 11:35:34 -0800 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2018-12-20 23:47:09 +0100 |
| commit | a136678c0bdbb650daff5df5eec1dab960e074a7 (patch) | |
| tree | d5bb32c153cfcadfbbecd612aea1bee8a6a5cd3f /net/core | |
| parent | bpf: sk_msg, fix socket data_ready events (diff) | |
| download | linux-dev-a136678c0bdbb650daff5df5eec1dab960e074a7.tar.xz linux-dev-a136678c0bdbb650daff5df5eec1dab960e074a7.zip | |
bpf: sk_msg, zap ingress queue on psock down
In addition to releasing any cork'ed data on a psock when the psock
is removed we should also release any skb's in the ingress work queue.
Otherwise the skb's eventually get free'd but late in the tear
down process so we see the WARNING due to non-zero sk_forward_alloc.
void sk_stream_kill_queues(struct sock *sk)
{
...
WARN_ON(sk->sk_forward_alloc);
...
}
Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skmsg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 3df7627db4bb..86c9726fced8 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -572,6 +572,7 @@ 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); |