Commit 7ebc14d5 authored by John Fastabend's avatar John Fastabend Committed by Alexei Starovoitov

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: 1aa12bdf ("bpf: sockmap, add sock close() hook to remove socks")
Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 99ba2b5a
...@@ -571,7 +571,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md) ...@@ -571,7 +571,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md)
while (sg[i].length) { while (sg[i].length) {
free += sg[i].length; free += sg[i].length;
sk_mem_uncharge(sk, 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].length = 0;
sg[i].page_link = 0; sg[i].page_link = 0;
sg[i].offset = 0; sg[i].offset = 0;
...@@ -580,6 +581,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md) ...@@ -580,6 +581,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md)
if (i == MAX_SKB_FRAGS) if (i == MAX_SKB_FRAGS)
i = 0; i = 0;
} }
if (md->skb)
consume_skb(md->skb);
return free; return free;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment