* [PATCH net] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit()
@ 2026-11-19 17:03 Ian Rogers
2026-11-19 17:39 ` [EXTERNAL] " Elad Nachman
0 siblings, 1 reply; 2+ messages in thread
From: Ian Rogers @ 2026-11-19 17:03 UTC (permalink / raw)
To: Elad Nachman, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-kernel, llvm, Elkin Cruz, Ian Rogers
prestera_rxtx_xmit() is invoked directly from prestera_port_xmit(), the
driver's .ndo_start_xmit() callback, whose return type is netdev_tx_t.
When skb_cow_head() or prestera_dsa_build() fails, prestera_rxtx_xmit()
returns NET_XMIT_DROP (0x01, a qdisc congestion code rather than a
netdev_tx_t value) without freeing skb.
In dev_hard_start_xmit(), any return code other than NETDEV_TX_OK (0x00)
is treated as a busy/requeue condition unless dev_xmit_complete() holds;
for an unrecognized positive value like 0x01, the core neither frees nor
requeues the skb (or hits the unrecognized-return WARN path), leaking
the packet buffer.
Free the skb with dev_kfree_skb_any(), increment the core tx_dropped
counter via dev_core_stats_tx_dropped_inc() (so .ndo_get_stats64 reports
the software drop), and return NETDEV_TX_OK.
Found by enabling Clang's -Wassign-enum on an x86_64 allyesconfig build,
with AI coding assistant help to audit the warning and prepare the fix.
Build-tested with Clang; not runtime-tested on Prestera switch hardware.
Fixes: 501ef3066c89 ("net: marvell: prestera: Add driver for Prestera family ASIC devices")
Signed-off-by: Ian Rogers <irogers@google.com>
---
drivers/net/ethernet/marvell/prestera/prestera_rxtx.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
index c4ea247d2470..7ac9220d33c5 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
@@ -817,13 +817,18 @@ netdev_tx_t prestera_rxtx_xmit(struct prestera_port *port, struct sk_buff *skb)
dsa.port_num = port->hw_id;
if (skb_cow_head(skb, PRESTERA_DSA_HLEN) < 0)
- return NET_XMIT_DROP;
+ goto drop_skb;
skb_push(skb, PRESTERA_DSA_HLEN);
memmove(skb->data, skb->data + PRESTERA_DSA_HLEN, 2 * ETH_ALEN);
if (prestera_dsa_build(&dsa, skb->data + 2 * ETH_ALEN) != 0)
- return NET_XMIT_DROP;
+ goto drop_skb;
return prestera_sdma_xmit(&port->sw->rxtx->sdma, skb);
+
+drop_skb:
+ dev_kfree_skb_any(skb);
+ dev_core_stats_tx_dropped_inc(port->dev);
+ return NETDEV_TX_OK;
}
--
2.56.1.708.g77570a6a1d-goog
^ permalink raw reply [flat|nested] 2+ messages in thread* RE: [EXTERNAL] [PATCH net] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit()
2026-11-19 17:03 [PATCH net] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit() Ian Rogers
@ 2026-11-19 17:39 ` Elad Nachman
0 siblings, 0 replies; 2+ messages in thread
From: Elad Nachman @ 2026-11-19 17:39 UTC (permalink / raw)
To: Ian Rogers, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-kernel, llvm, Elkin Cruz
> prestera_rxtx_xmit() is invoked directly from prestera_port_xmit(), the
> driver's .ndo_start_xmit() callback, whose return type is netdev_tx_t.
> When skb_cow_head() or prestera_dsa_build() fails, prestera_rxtx_xmit()
> returns NET_XMIT_DROP (0x01, a qdisc congestion code rather than a
> netdev_tx_t value) without freeing skb.
>
> In dev_hard_start_xmit(), any return code other than NETDEV_TX_OK (0x00)
> is treated as a busy/requeue condition unless dev_xmit_complete() holds;
> for an unrecognized positive value like 0x01, the core neither frees nor
> requeues the skb (or hits the unrecognized-return WARN path), leaking
> the packet buffer.
Did you check it yourself or was this sentence AI generated?
Please check here:
https://elixir.bootlin.com/linux/v7.4-rc1/source/include/linux/netdevice.h#L122
and here:
https://elixir.bootlin.com/linux/v7.4-rc1/source/include/linux/netdevice.h#L144
You indeed need to free the SKB, but as long as rc < 0xf (which is true for both the
NET_XMIT_DROP and the NETDEV_TX_OK cases), the behavior of dev_hard_start_xmit() is the same:
https://elixir.bootlin.com/linux/v7.4-rc1/source/net/core/dev.c#L4074
>
> Free the skb with dev_kfree_skb_any(), increment the core tx_dropped
> counter via dev_core_stats_tx_dropped_inc() (so .ndo_get_stats64 reports
> the software drop), and return NETDEV_TX_OK.
>
> Found by enabling Clang's -Wassign-enum on an x86_64 allyesconfig build,
> with AI coding assistant help to audit the warning and prepare the fix.
> Build-tested with Clang; not runtime-tested on Prestera switch hardware.
>
> Fixes: 501ef3066c89 ("net: marvell: prestera: Add driver for Prestera family ASIC devices")
> Signed-off-by: Ian Rogers <mailto:irogers@google.com>
> ---
> drivers/net/ethernet/marvell/prestera/prestera_rxtx.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
> index c4ea247d2470..7ac9220d33c5 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
> @@ -817,13 +817,18 @@ netdev_tx_t prestera_rxtx_xmit(struct prestera_port *port, struct sk_buff *skb)
> dsa.port_num = port->hw_id;
>
> if (skb_cow_head(skb, PRESTERA_DSA_HLEN) < 0)
> - return NET_XMIT_DROP;
> + goto drop_skb;
>
> skb_push(skb, PRESTERA_DSA_HLEN);
> memmove(skb->data, skb->data + PRESTERA_DSA_HLEN, 2 * ETH_ALEN);
>
> if (prestera_dsa_build(&dsa, skb->data + 2 * ETH_ALEN) != 0)
> - return NET_XMIT_DROP;
> + goto drop_skb;
>
> return prestera_sdma_xmit(&port->sw->rxtx->sdma, skb);
> +
> +drop_skb:
> + dev_kfree_skb_any(skb);
> + dev_core_stats_tx_dropped_inc(port->dev);
> + return NETDEV_TX_OK;
For the sake of clarity I would return here NET_XMIT_DROP . The behavior in dev_hard_start_xmit() would be the same.
There are 53 drivers which currently return this value, this is not an isolated case of just the prestera switchdev one:
https://elixir.bootlin.com/linux/v7.4-rc1/C/ident/NET_XMIT_DROP
The rest of the patch is fine.
> }
> --
> 2.56.1.708.g77570a6a1d-goog
>
Elad.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-19 17:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 17:03 [PATCH net] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit() Ian Rogers
2026-11-19 17:39 ` [EXTERNAL] " Elad Nachman
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®