diff options
| author | Eric Dumazet <edumazet@google.com> | 2022-05-09 20:57:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-09 10:22:36 +0200 |
| commit | 6320ae1b5876c30bf98203b6a5abe8b5c45e6a04 (patch) | |
| tree | 9f1caf747b223d4913900f0991397768e4372f31 /net/core | |
| parent | db6da340d66b8392dcecca0daa45051a8c1e4963 (diff) | |
| download | linux-stable-6320ae1b5876c30bf98203b6a5abe8b5c45e6a04.tar.gz linux-stable-6320ae1b5876c30bf98203b6a5abe8b5c45e6a04.tar.bz2 linux-stable-6320ae1b5876c30bf98203b6a5abe8b5c45e6a04.zip | |
net: remove two BUG() from skb_checksum_help()
[ Upstream commit d7ea0d9df2a6265b2b180d17ebc64b38105968fc ]
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 5907212c00f3..b9731b267d07 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3233,11 +3233,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) |