From: Tianyi Gao <tianyi@cloudflare.com>
To: netdev@vger.kernel.org
Cc: magnus.karlsson@intel.com, maciej.fijalkowski@intel.com,
sdf@fomichev.me, davem@davemloft.net, edumazet@kernel.org,
kuba@kernel.org, pabeni@redhat.com, horms@kernel.org,
ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org,
john.fastabend@gmail.com, yoong.siang.song@intel.com,
kerneljasonxing@gmail.com, bpf@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-team@cloudflare.com,
tianyi.gao@linux.dev, Tianyi Gao <tianyi@cloudflare.com>,
Sashiko <sashiko-bot@kernel.org>
Subject: [PATCH net] xsk: reject TX checksum requests that overflow skb->csum_start
Date: Mon, 16 Nov 2026 16:28:34 +0000 [thread overview]
Message-ID: <20261116162834.30087-1-tianyi@cloudflare.com> (raw)
xsk_skb_metadata() sets the u16 skb->csum_start to hr + csum_start. With
64K pages, csum_start can be close to U16_MAX, so the sum can overflow.
The checksum offset then becomes negative. With XDP_UMEM_TX_SW_CSUM,
skb_checksum_help() triggers a warning. Without it, the device gets a
CHECKSUM_PARTIAL skb with a negative offset.
Reject this with -EINVAL. Use the limit of skb_partial_csum_set(), which
also rejects U16_MAX, the "not set" value of transport_header. That
helper cannot be used here, as the skb built for an IFF_TX_SKB_NO_LINEAR
device has no linear data.
Fixes: 48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://lore.kernel.org/all/sashiko-outbox-203545@kernel.org/
Signed-off-by: Tianyi Gao <tianyi@cloudflare.com>
---
Sashiko reported this in [1], and earlier in [2][3].
Returning -EINVAL leaves the descriptor in the TX ring, as the current
check does [2]. That is a separate issue and out of scope here.
There is no selftest. The umem chunk size is at most PAGE_SIZE, so only
a 64K-page kernel can hit this.
[1] https://lore.kernel.org/all/sashiko-outbox-203545@kernel.org/
[2] https://lore.kernel.org/all/20260518063407.C3B99C2BCB7@smtp.kernel.org/
[3] https://lore.kernel.org/all/20260531042721.DBD4B1F00893@smtp.kernel.org/
net/xdp/xsk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index f22f9a2cdbbe..ab2e4fa87a4f 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -1006,7 +1006,8 @@ static int xsk_skb_metadata(struct sk_buff *skb, void *buffer,
csum_offset = READ_ONCE(meta->request.csum_offset);
if (unlikely(csum_start + csum_offset +
- sizeof(__sum16) > desc->len))
+ sizeof(__sum16) > desc->len ||
+ hr + csum_start >= U16_MAX))
return -EINVAL;
skb->csum_start = hr + csum_start;
base-commit: aa40afa831ebfe45e40a23721711059f2ac584d4
--
2.56.0
next reply other threads:[~2026-11-16 16:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 16:28 Tianyi Gao [this message]
2026-11-16 16:32 ` netdev-bot+sinfo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116162834.30087-1-tianyi@cloudflare.com \
--to=tianyi@cloudflare.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=hawk@kernel.org \
--cc=horms@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kernel-team@cloudflare.com \
--cc=kerneljasonxing@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sashiko-bot@kernel.org \
--cc=sdf@fomichev.me \
--cc=tianyi.gao@linux.dev \
--cc=yoong.siang.song@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®