diff options
| author |   John Fastabend <john.fastabend@gmail.com> | 2018-07-05 08:50:10 -0700 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2018-07-07 15:19:30 -0700 |
| commit | 7ebc14d507b4b55105da8d1a1eda323381529cc7 (patch) | |
| tree | 9ab11b61f7c81e96c841ca4a2eaa82f628a305bf /kernel | |
| parent | bpf: sockhash, disallow bpf_tcp_close and update in parallel (diff) | |
| download | linux-dev-7ebc14d507b4b55105da8d1a1eda323381529cc7.tar.xz linux-dev-7ebc14d507b4b55105da8d1a1eda323381529cc7.zip | |
bpf: sockmap, consume_skb in close path
Currently, when a sock is closed and the bpf_tcp_close() callback is
used we remove memory but do not free the skb. Call consume_skb() if
the skb is attached to the buffer.
Reported-by: syzbot+d464d2c20c717ef5a6a8@syzkaller.appspotmail.com
Fixes: 1aa12bdf1bfb ("bpf: sockmap, add sock close() hook to remove socks")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/sockmap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c index 9c67e96fe336..dfc8a8a07c1f 100644 --- a/kernel/bpf/sockmap.c +++ b/kernel/bpf/sockmap.c @@ -571,7 +571,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md) while (sg[i].length) { free += sg[i].length; sk_mem_uncharge(sk, sg[i].length); - put_page(sg_page(&sg[i])); + if (!md->skb) + put_page(sg_page(&sg[i])); sg[i].length = 0; sg[i].page_link = 0; sg[i].offset = 0; @@ -580,6 +581,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md) if (i == MAX_SKB_FRAGS) i = 0; } + if (md->skb) + consume_skb(md->skb); return free; } |