[PATCH net-next v2 09/15] net: skbuff: check csum_start against len in skb_copy_and_csum_dev()

[Josef Bacik <josef@xxxxxxxxxxxxxx>]

Commit 56453199d28f ("net: skbuff: don't BUG() on a bad csum_start in
skb_copy_and_csum_dev()") checks the checksum start against both ends
of the linear area before copying up to it.  For an skb that isn't
CHECKSUM_PARTIAL, though, the checksum start is skb_headlen() itself,
so the check compares it to itself and can't fail.  If data_len is
bigger than len, skb_headlen() underflows to about 4GB, and that
becomes the length skb_copy_from_linear_data() copies into the
driver's bounce buffer.

The old BUG_ON() had the same blind spot.  Also check the checksum
start against skb->len, so such an skb takes the existing fallback,
which copies at most skb->len bytes without filling in the checksum.

Found by LLM review after the series that made the change was applied.

Fixes: 56453199d28f ("net: skbuff: don't BUG() on a bad csum_start in 
skb_copy_and_csum_dev()")
Assisted-by: LLM
Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
---
 net/core/skbuff.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5c89c463f234..782a6bacd568 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4103,7 +4103,11 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 
*to)
        else
                csstart = skb_headlen(skb);
 
+       /* skb_headlen() underflows if data_len is bigger than len, so check
+        * csstart against len as well.
+        */
        if (unlikely(csstart < 0 || csstart > skb_headlen(skb) ||
+                    csstart > skb->len ||
                     (skb->ip_summed == CHECKSUM_PARTIAL &&
                      csstart + skb->csum_offset + sizeof(__sum16) >
                      skb->len))) {

-- 
2.55.0