Skip to content

Commit 2bbe3e5

Browse files
Florian Westphalborkmann
authored andcommitted
bpf: Avoid splat in pskb_pull_reason
syzkaller builds (CONFIG_DEBUG_NET=y) frequently trigger a debug hint in pskb_may_pull. We'd like to retain this debug check because it might hint at integer overflows and other issues (kernel code should pull headers, not huge value). In bpf case, this splat isn't interesting at all: such (nonsensical) bpf programs are typically generated by a fuzzer anyway. Do what Eric suggested and suppress such warning. For CONFIG_DEBUG_NET=n we don't need the extra check because pskb_may_pull will do the right thing: return an error without the WARN() backtrace. Fixes: 219eee9 ("net: skbuff: add overflow debug check to pull/push helpers") Reported-by: syzbot+0c4150bff9fff3bf023c@syzkaller.appspotmail.com Suggested-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Eric Dumazet <edumazet@google.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Closes: https://syzkaller.appspot.com/bug?extid=0c4150bff9fff3bf023c Link: https://lore.kernel.org/netdev/9f254c96-54f2-4457-b7ab-1d9f6187939c@gmail.com/ Link: https://lore.kernel.org/bpf/20240614101801.9496-1-fw@strlen.de
1 parent b99a95b commit 2bbe3e5

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

net/core/filter.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,6 +1665,11 @@ static DEFINE_PER_CPU(struct bpf_scratchpad, bpf_sp);
16651665
static inline int __bpf_try_make_writable(struct sk_buff *skb,
16661666
unsigned int write_len)
16671667
{
1668+
#ifdef CONFIG_DEBUG_NET
1669+
/* Avoid a splat in pskb_may_pull_reason() */
1670+
if (write_len > INT_MAX)
1671+
return -EINVAL;
1672+
#endif
16681673
return skb_ensure_writable(skb, write_len);
16691674
}
16701675

0 commit comments

Comments
 (0)