net: stmmac: fix integer underflow in chain mode jumbo_frm
Subsystems (5)
PATCH 1/1 net: stmmac: fix integer underflow in chain mode jumbo_frm
The jumbo_frm() chain-mode implementation unconditionally computes
len = nopaged_len - bmax;
where nopaged_len = skb_headlen(skb) (linear bytes only) and bmax is BUF_SIZE_8KiB or BUF_SIZE_2KiB. However, the caller stmmac_xmit() decides to invoke jumbo_frm() based on skb->len (total length including page fragments):
is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc);
When a packet has a small linear portion (nopaged_len <= bmax) but a large total length due to page fragments (skb->len > bmax), the subtraction wraps as an unsigned integer, producing a huge len value (~0xFFFFxxxx). This causes the while (len != 0) loop to execute hundreds of thousands of iterations, passing skb->data + bmax * i pointers far beyond the skb buffer to dma_map_single(). On IOMMU-less SoCs (the typical deployment for stmmac), this maps arbitrary kernel memory to the DMA engine, constituting a kernel memory disclosure and potential memory corruption from hardware.
The ring-mode counterpart already guards against this with:
if (nopaged_len > BUF_SIZE_8KiB) { ... use len ... }
else { ... map nopaged_len directly ... }Apply the same pattern to chain mode: guard the chunked-DMA path with if (nopaged_len > bmax), and add an else branch that maps the entire linear portion as a single descriptor when it fits within bmax. The fragment loop in stmmac_xmit() handles page fragments afterward.
--- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 71 ++++++++++++++--------- 1 file changed, 44 insertions(+), 27 deletions(-)
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +58 -45
@@ -31,52 +31,65 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,else bmax = BUF_SIZE_2KiB; - len = nopaged_len - bmax; - - des2 =dma_map_single (priv->device, skb->data, - bmax,DMA_TO_DEVICE ); - desc->des2 =cpu_to_le32 (des2); -if (dma_mapping_error (priv->device, des2)) -return -1 ; - tx_q->tx_skbuff_dma[entry].buf = des2; - tx_q->tx_skbuff_dma[entry].len = bmax; -/* do not close the descriptor and do not set own bit */ -stmmac_prepare_tx_desc (priv, desc,1 , bmax, csum,STMMAC_CHAIN_MODE , -0 , false, skb->len); - -while (len !=0 ) { - tx_q->tx_skbuff[entry] =NULL ; - entry =STMMAC_GET_ENTRY (entry, priv->dma_conf.dma_tx_size); - desc = tx_q->dma_tx + entry; - -if (len > bmax) { - des2 =dma_map_single (priv->device, - (skb->data + bmax * i), - bmax,DMA_TO_DEVICE ); - desc->des2 =cpu_to_le32 (des2); -if (dma_mapping_error (priv->device, des2)) -return -1 ; - tx_q->tx_skbuff_dma[entry].buf = des2; - tx_q->tx_skbuff_dma[entry].len = bmax; -stmmac_prepare_tx_desc (priv, desc,0 , bmax, csum, -STMMAC_CHAIN_MODE ,1 , false, skb->len); - len -= bmax; - i++; - }else { - des2 =dma_map_single (priv->device, - (skb->data + bmax * i), len, -DMA_TO_DEVICE ); - desc->des2 =cpu_to_le32 (des2); -if (dma_mapping_error (priv->device, des2)) -return -1 ; - tx_q->tx_skbuff_dma[entry].buf = des2; - tx_q->tx_skbuff_dma[entry].len = len; -/* last descriptor can be set now */ -stmmac_prepare_tx_desc (priv, desc,0 , len, csum, -STMMAC_CHAIN_MODE ,1 , true, skb->len); - len =0 ; +if (nopaged_len > bmax) { + len = nopaged_len - bmax; + + des2 =dma_map_single (priv->device, skb->data, + bmax,DMA_TO_DEVICE ); + desc->des2 =cpu_to_le32 (des2); +if (dma_mapping_error (priv->device, des2)) +return -1 ; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = bmax; +/* do not close the descriptor and do not set own bit */ +stmmac_prepare_tx_desc (priv, desc,1 , bmax, csum,STMMAC_CHAIN_MODE , +0 , false, skb->len); + +while (len !=0 ) { + tx_q->tx_skbuff[entry] =NULL ; + entry =STMMAC_GET_ENTRY (entry, priv->dma_conf.dma_tx_size); + desc = tx_q->dma_tx + entry; + +if (len > bmax) { + des2 =dma_map_single (priv->device, + (skb->data + bmax * i), + bmax,DMA_TO_DEVICE ); + desc->des2 =cpu_to_le32 (des2); +if (dma_mapping_error (priv->device, des2)) +return -1 ; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = bmax; +stmmac_prepare_tx_desc (priv, desc,0 , bmax, csum, +STMMAC_CHAIN_MODE ,1 , false, skb->len); + len -= bmax; + i++; + }else { + des2 =dma_map_single (priv->device, + (skb->data + bmax * i), len, +DMA_TO_DEVICE ); + desc->des2 =cpu_to_le32 (des2); +if (dma_mapping_error (priv->device, des2)) +return -1 ; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = len; +/* last descriptor can be set now */ +stmmac_prepare_tx_desc (priv, desc,0 , len, csum, +STMMAC_CHAIN_MODE ,1 , true, skb->len); + len =0 ; + } } - } + }else { + des2 =dma_map_single (priv->device, skb->data, + nopaged_len,DMA_TO_DEVICE ); + desc->des2 =cpu_to_le32 (des2); +if (dma_mapping_error (priv->device, des2)) +return -1 ; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = nopaged_len; +stmmac_prepare_tx_desc (priv, desc,1 , nopaged_len, csum, +STMMAC_CHAIN_MODE ,0 , !skb_is_nonlinear (skb), + skb->len); + } tx_q->cur_tx = entry;
--
2.39.5
Simon Horman
reviewerQuoted 26 lines · Tyllis Xu
The
jumbo_frm()chain-mode implementation unconditionally computeslen = nopaged_len - bmax;where
nopaged_len=skb_headlen(skb)(linear bytes only) and bmax isBUF_SIZE_8KiBorBUF_SIZE_2KiB. However, the callerstmmac_xmit()decides to invokejumbo_frm()based onskb->len(total length including page fragments):is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc);When a packet has a small linear portion (
nopaged_len<= bmax) but a large total length due to page fragments (skb->len> bmax), the subtraction wraps as an unsigned integer, producing a huge len value (~0xFFFFxxxx). This causes the while (len != 0) loop to execute hundreds of thousands of iterations, passingskb->data+ bmax * i pointers far beyond the skb buffer todma_map_single(). On IOMMU-less SoCs (the typical deployment for stmmac), this maps arbitrary kernel memory to the DMA engine, constituting a kernel memory disclosure and potential memory corruption from hardware.The ring-mode counterpart already guards against this with:
if (nopaged_len > BUF_SIZE_8KiB) { ... use len ... } else { ... map nopaged_len directly ... }
Quoted 8 lines
Apply the same pattern to chain mode: guard the chunked-DMA path with if (
nopaged_len> bmax), and add an else branch that maps the entire linear portion as a single descriptor when it fits within bmax. The fragment loop instmmac_xmit()handles page fragments afterward.Fixes 286a83721720 ("stmmac: add CHAINED descriptor mode support (V4)")Signed-off-by Tyllis Xu <[email protected]>
As a fix for code present in net this patch should be targeted at the net tree like this:
Subject: [PATCH net] net: stmmac: fix integer underflow in chain mode
As is, our CI tries to apply this patch to the default tree, net-next. Which fails due to a conflict with commit 6b4286e05508 ("net: stmmac:
rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()"). So no CI tests were run.
Quoted 3 lines
--- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 71 ++++++++++++++--------- 1 file changed, 44 insertions(+), 27 deletions(-)
The bulk of this patch is whitespace change (indentation). So seems useful to examine this patch with whitespace changes ignored.
git diff -w yeilds;
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +13 -0
@@ -31,6 +31,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,else bmax = BUF_SIZE_2KiB; +if (nopaged_len > bmax) { len = nopaged_len - bmax; des2 = dma_map_single(priv->device, skb->data,
@@ -77,6 +78,18 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb, len =0 ; } } + }else { + des2 =dma_map_single (priv->device, skb->data, + nopaged_len,DMA_TO_DEVICE ); + desc->des2 =cpu_to_le32 (des2); +if (dma_mapping_error (priv->device, des2)) +return -1 ; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = nopaged_len; +stmmac_prepare_tx_desc (priv, desc,1 , nopaged_len, csum, +STMMAC_CHAIN_MODE ,0 , !skb_is_nonlinear (skb), + skb->len); + } tx_q->cur_tx = entry;
The code in the else arm of the new condition is quite similar to the (not visible in the diff above) code at the top of the non-else arm of the condition.
I do see this is consistent with the ring-mode code. So perhaps it is appropriate as a fix. But I do wonder if this could be consolidated - e.g. by setting up some local variables rather than moving the mapping logic into a condition.
I will try to change the code to consolidate with the ring-mode code, avoid whitespace diff, and resubmit the patch with a new correct subject line. Thank you for your feedback!
Quoted 95 lines · Simon Horman
Quoted 26 lines · Tyllis Xu
The
jumbo_frm()chain-mode implementation unconditionally computeslen = nopaged_len - bmax;where
nopaged_len=skb_headlen(skb)(linear bytes only) and bmax isBUF_SIZE_8KiBorBUF_SIZE_2KiB. However, the callerstmmac_xmit()decides to invokejumbo_frm()based onskb->len(total length including page fragments):is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc);When a packet has a small linear portion (
nopaged_len<= bmax) but a large total length due to page fragments (skb->len> bmax), the subtraction wraps as an unsigned integer, producing a huge len value (~0xFFFFxxxx). This causes the while (len != 0) loop to execute hundreds of thousands of iterations, passingskb->data+ bmax * i pointers far beyond the skb buffer todma_map_single(). On IOMMU-less SoCs (the typical deployment for stmmac), this maps arbitrary kernel memory to the DMA engine, constituting a kernel memory disclosure and potential memory corruption from hardware.The ring-mode counterpart already guards against this with:
if (nopaged_len > BUF_SIZE_8KiB) { ... use len ... } else { ... map nopaged_len directly ... }Quoted 8 lines
Apply the same pattern to chain mode: guard the chunked-DMA path with if (
nopaged_len> bmax), and add an else branch that maps the entire linear portion as a single descriptor when it fits within bmax. The fragment loop instmmac_xmit()handles page fragments afterward.Fixes 286a83721720 ("stmmac: add CHAINED descriptor mode support (V4)")Signed-off-by Tyllis Xu <[email protected]>As a fix for code present in net this patch should be targeted at the net tree like this:
Subject: [PATCH net] net: stmmac: fix integer underflow in chain mode
As is, our CI tries to apply this patch to the default tree, net-next. Which fails due to a conflict with commit
6b4286e05508("net: stmmac:
renameSTMMAC_GET_ENTRY()->STMMAC_NEXT_ENTRY()"). So no CI tests were run.Quoted 3 lines
--- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 71 ++++++++++++++--------- 1 file changed, 44 insertions(+), 27 deletions(-)The bulk of this patch is whitespace change (indentation). So seems useful to examine this patch with whitespace changes ignored.
git diff -w yeilds;
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +13
-0@@ -31,6 +31,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,else bmax = BUF_SIZE_2KiB; +if (nopaged_len > bmax) { len = nopaged_len - bmax; des2 = dma_map_single(priv->device, skb->data,@@ -77,6 +78,18 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb, len =0 ; } } + }else { + des2 =dma_map_single (priv->device, skb->data, + nopaged_len,DMA_TO_DEVICE ); + desc->des2 =cpu_to_le32 (des2); +if (dma_mapping_error (priv->device, des2)) +return -1 ; + tx_q->tx_skbuff_dma[entry].buf = des2; + tx_q->tx_skbuff_dma[entry].len = nopaged_len; +stmmac_prepare_tx_desc (priv, desc,1 , nopaged_len, csum, +STMMAC_CHAIN_MODE ,0 , !skb_is_nonlinear (skb), + skb->len); + } tx_q->cur_tx = entry;The code in the else arm of the new condition is quite similar to the (not visible in the diff above) code at the top of the non-else arm of the condition.
I do see this is consistent with the ring-mode code. So perhaps it is appropriate as a fix. But I do wonder if this could be consolidated - e.g. by setting up some local variables rather than moving the mapping logic into a condition.
Quoted 3 lines · Tyllis Xu
I will try to change the code to consolidate with the ring-mode code, avoid whitespace diff, and resubmit the patch with a new correct subject line. Thank you for your feedback!
I mentioned the possibilities of other problems. How about this:
static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
{
unsigned int nopaged_len = skb_headlen(skb);
...
enh_desc = priv->plat->enh_desc;
/* To program the descriptors according to the size of the frame */
if (enh_desc)
is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc);1. enh_desc is set if priv->dma_cap.enh_desc is set and DMA capabilities exist (dmwac1000 and more recent.)
2. in chain mode, is_jumbo will be true if skb->len > 8KiB. in ring mode, is_jumbo will be true if skb->len >= 4KiB (note the >= vs > there which is suspicious.)
Let's consider the case where is_jumbo is false. So this could be a packet with skb->len up to 4KiB-1 or 8KiB.
if (unlikely(is_jumbo)) {
} else {
dma_addr = dma_map_single(priv->device, skb->data,
nopaged_len, DMA_TO_DEVICE);
stmmac_set_desc_addr(priv, first_desc, dma_addr);
/* Prepare the first descriptor without setting the OWN bit */
stmmac_prepare_tx_desc(priv, first_desc, 1, nopaged_len,
csum_insertion, priv->descriptor_mode,
0, last_segment, skb->len);This can call one of several functions.
ndesc_prepare_tx_desc():
if (descriptor_mode == STMMAC_CHAIN_MODE)
norm_set_tx_desc_len_on_chain(p, len);
else
norm_set_tx_desc_len_on_ring(p, len);static inline void norm_set_tx_desc_len_on_chain(struct dma_desc *p, int len)
{
p->des1 |= cpu_to_le32(len & TDES1_BUFFER1_SIZE_MASK);
}#define TDES1_BUFFER1_SIZE_MASK GENMASK(10, 0)
So, this masks the length with 0x7ff, meaning this can represent buffers up to 2047 bytes _max_ for normal descriptors in chain mode.
static inline void norm_set_tx_desc_len_on_ring(struct dma_desc *p, int len)
{
unsigned int buffer1_max_length = BUF_SIZE_2KiB - 1;
if (unlikely(len > buffer1_max_length)) {
p->des1 |= cpu_to_le32(FIELD_PREP(TDES1_BUFFER2_SIZE_MASK,
len - buffer1_max_length) |
FIELD_PREP(TDES1_BUFFER1_SIZE_MASK,
buffer1_max_length));
} else {
p->des1 |= cpu_to_le32(FIELD_PREP(TDES1_BUFFER1_SIZE_MASK,
len));
}
}#define TDES1_BUFFER2_SIZE_MASK GENMASK(21, 11)
This works around the 2KiB limitation, and fills buffer 1 with 2047 bytes and buffer 2 with the remainder... but there is _no_ code that writes buffer 2's address in this case. This means we will transmit garbage - and unknowingly of transmit COE is enabled (because the checksums will be based on the data the NIC read from memory.)
However, normal descriptors in ring mode can correctly transmit up to 2047 bytes correctly, or garbage after that up to 4094 bytes.
Now, this in the probe function:
ndev->max_mtu = SKB_MAX_HEAD(NET_SKB_PAD + NET_IP_ALIGN);
equates to:
PAGE_SIZE - NET_SKB_PAD - NET_IP_ALIGN - aligned skb_shared_info.
Notice that this doesn't limit by what the hardware can actually do.
Consider the implications where PAGE_SIZE is 16KiB or 64KiB and the stmmac hardware only supports normal descriptors. max_mtu gets set to something close to PAGE_SIZE. Even for 4KiB, it'll be close to that. If skb_headlen(skb) can approach max_mtu, then we have the very real possibility of overflowing the first descriptor - which in normal mode can only really handle up to 2047 bytes.
This has been on my list of issues to try and sort out at some point, at the moment I don't have any patches, but I'm instead trying to clean up the code to make it more understandable so I can start thinking about possible solutions. The code here has been a total trainwreck, and some of those cleanups have recently gone in to net-next.
I think the driver has only really been tested with the standard 1500 byte MTU, and maybe briefly with the 9KiB jumbo MTU, but honestly I feel like saying that the transmit paths need thrown away and totally rewritten - including that absolutely wrong max_mtu setting in the probe function.
However, the problem is... I don't have hardware that uses normal nor enhanced descriptors - my hardware is a nVidia Xavier, which is a dwmac4/5 implementation using a different descriptor format, so I can only make changes through sets of simple transformations.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
PATCH v2 1/1 net: stmmac: fix integer underflow in chain mode
The jumbo_frm() chain-mode implementation unconditionally computes
len = nopaged_len - bmax;
where nopaged_len = skb_headlen(skb) (linear bytes only) and bmax is BUF_SIZE_8KiB or BUF_SIZE_2KiB. However, the caller stmmac_xmit() decides to invoke jumbo_frm() based on skb->len (total length including page fragments):
is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc);
When a packet has a small linear portion (nopaged_len <= bmax) but a large total length due to page fragments (skb->len > bmax), the subtraction wraps as an unsigned integer, producing a huge len value (~0xFFFFxxxx). This causes the while (len != 0) loop to execute hundreds of thousands of iterations, passing skb->data + bmax * i pointers far beyond the skb buffer to dma_map_single(). On IOMMU-less SoCs (the typical deployment for stmmac), this maps arbitrary kernel memory to the DMA engine, constituting a kernel memory disclosure and potential memory corruption from hardware.
Fix this by introducing a buf_len local variable clamped to min(nopaged_len, bmax). Computing len = nopaged_len - buf_len is then always safe: it is zero when the linear portion fits within a single descriptor, causing the while (len != 0) loop to be skipped naturally, and the fragment loop in stmmac_xmit() handles page fragments afterward.
---
v2: Instead of restructuring into an if/else block (v1), introduce a
buf_len local variable clamped to min(nopaged_len, bmax) so the subtraction and the existing while loop remain structurally intact. Suggested by Russell King.
drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +6 -5
@@ -20,7 +20,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,unsigned int nopaged_len =skb_headlen (skb);struct stmmac_priv *priv = tx_q->priv_data;unsigned int entry = tx_q->cur_tx; -unsigned int bmax, des2; +unsigned int bmax, buf_len, des2;unsigned int i =1 , len;struct dma_desc *desc;
@@ -31,17 +31,18 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,else bmax = BUF_SIZE_2KiB; - len = nopaged_len - bmax; + buf_len = min_t(unsigned int, nopaged_len, bmax); + len = nopaged_len - buf_len; des2 =dma_map_single (priv->device, skb->data, - bmax,DMA_TO_DEVICE ); + buf_len,DMA_TO_DEVICE ); desc->des2 =cpu_to_le32 (des2);if (dma_mapping_error (priv->device, des2))return -1 ; tx_q->tx_skbuff_dma[entry].buf = des2; - tx_q->tx_skbuff_dma[entry].len = bmax; + tx_q->tx_skbuff_dma[entry].len = buf_len;/* do not close the descriptor and do not set own bit */ -stmmac_prepare_tx_desc (priv, desc,1 , bmax, csum,STMMAC_CHAIN_MODE , +stmmac_prepare_tx_desc (priv, desc,1 , buf_len, csum,STMMAC_CHAIN_MODE ,0 , false, skb->len);while (len !=0 ) {
Signature · 1 line
2.43.0
Re: [PATCH net v2] net: stmmac: fix integer underflow in chain mode
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 31 Mar 2026 23:47:07 -0500 you wrote:
The
jumbo_frm()chain-mode implementation unconditionally computeslen = nopaged_len - bmax;where
nopaged_len=skb_headlen(skb)(linear bytes only) and bmax isBUF_SIZE_8KiBorBUF_SIZE_2KiB. However, the callerstmmac_xmit()decides to invokejumbo_frm()based onskb->len(total length including page fragments):[...]
Here is the summary with links:
- [net,v2] net: stmmac: fix integer underflow in chain mode
https://git.kernel.org/netdev/net/c/51f4e090b9f8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html