mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: remove two BUG() from skb_checksum_help()

Browse Source 
[ Upstream commit d7ea0d9df2 ]

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>
This commit is contained in:
Eric Dumazet
2022-05-09 20:57:40 -07:00
committed by Greg Kroah-Hartman
parent 4f99bde59e
commit 312c43e98e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/core/dev.c
View File

@@ -3241,11 +3241,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)