bpf, sockmap: Do not ignore orig_len parameter
authorEric Dumazet <edumazet@google.com>
Wed, 2 Mar 2022 16:17:22 +0000 (08:17 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 3 Mar 2022 06:49:03 +0000 (22:49 -0800)
commit60ce37b03917e593d8e5d8bcc7ec820773daf81d
tree9f4db2b6e73ce9cca1e0197b5ee97d02e15433e4
parent1dba41c9d2e2dc94b543394974f63d55aa195bfe
bpf, sockmap: Do not ignore orig_len parameter

Currently, sk_psock_verdict_recv() returns skb->len

This is problematic because tcp_read_sock() might have
passed orig_len < skb->len, due to the presence of TCP urgent data.

This causes an infinite loop from tcp_read_sock()

Followup patch will make tcp_read_sock() more robust vs bad actors.

Fixes: ef5659280eb1 ("bpf, sockmap: Allow skipping sk_skb parser program")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/20220302161723.3910001-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/skmsg.c