Skip to content

Commit

Permalink
net: remove two BUG() from skb_checksum_help()
Browse files Browse the repository at this point in the history
[ Upstream commit d7ea0d9 ]

I have a syzbot report that managed to get a crash in skb_checksum_help()

If syzbot can trigger these BUG(), it makes sense to replace
them with more friendly WARN_ON_ONCE() since skb_checksum_help()
can instead return an error code.

Note that syzbot will still crash there, until real bug is fixed.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Eric Dumazet authored and gregkh committed Jun 9, 2022
1 parent 2216b1f commit b1320c9
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions net/core/dev.c
Expand Up @@ -3215,11 +3215,15 @@ int skb_checksum_help(struct sk_buff *skb)
}

offset = skb_checksum_start_offset(skb);
BUG_ON(offset >= skb_headlen(skb));
ret = -EINVAL;
if (WARN_ON_ONCE(offset >= skb_headlen(skb)))
goto out;

csum = skb_checksum(skb, offset, skb->len - offset, 0);

offset += skb->csum_offset;
BUG_ON(offset + sizeof(__sum16) > skb_headlen(skb));
if (WARN_ON_ONCE(offset + sizeof(__sum16) > skb_headlen(skb)))
goto out;

ret = skb_ensure_writable(skb, offset + sizeof(__sum16));
if (ret)
Expand Down

0 comments on commit b1320c9

Please sign in to comment.