Netdev List
 help / color / mirror / Atom feed
* [PATCH net v2] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit()
@ 2026-11-22  4:53 Ian Rogers
  2026-11-22  6:35 ` [EXTERNAL] " Elad Nachman
  0 siblings, 1 reply; 2+ messages in thread
From: Ian Rogers @ 2026-11-22  4:53 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) without freeing skb.

Because NET_XMIT_DROP (0x01) is less than NET_XMIT_MASK (0x0f),
dev_xmit_complete() returns true and dev_hard_start_xmit() assumes the
driver has already consumed or freed the skb, 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 NET_XMIT_DROP.

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 LLVM=1 W=1 (-Werror); 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>
---

Notes:
    v2:
      - Keep returning NET_XMIT_DROP at drop_skb and fix the commit message
        description of dev_xmit_complete() / dev_hard_start_xmit() (Elad
        Nachman).
    
    v1: https://lore.kernel.org/r/20261119170354.1509589-1-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..e62378abcffc 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 NET_XMIT_DROP;
 }
-- 
2.56.1.750.gf70dc682cf-goog


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* RE: [EXTERNAL] [PATCH net v2] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit()
  2026-11-22  4:53 [PATCH net v2] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit() Ian Rogers
@ 2026-11-22  6:35 ` Elad Nachman
  0 siblings, 0 replies; 2+ messages in thread
From: Elad Nachman @ 2026-11-22  6:35 UTC (permalink / raw)
  To: Ian Rogers, Andrew Lunn, David S. Miller, Eric Dumazet,
	Jakub Kicinski, Paolo Abeni
  Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	llvm@lists.linux.dev, 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) without freeing skb.
>
> Because NET_XMIT_DROP (0x01) is less than NET_XMIT_MASK (0x0f),
> dev_xmit_complete() returns true and dev_hard_start_xmit() assumes the
> driver has already consumed or freed the skb, 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 NET_XMIT_DROP.
>
> 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 LLVM=1 W=1 (-Werror); 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>
> ---
>
> Notes:
>     v2:
>       - Keep returning NET_XMIT_DROP at drop_skb and fix the commit message
>         description of dev_xmit_complete() / dev_hard_start_xmit() (Elad
>         Nachman).
>
>     v1: https://urldefense.com/v3/__https://lore.kernel.org/r/20261119170354.1509589-1-irogers@google.com__;!!CRVmXkqW!UVuArjqOd_sHknzc01c5uOUs3t0K05yjc3r2k9K0i8cXLfv1d5paSzsrHkJLBsCAwM26fkRiSxEPLZc$
>
>  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..e62378abcffc 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 NET_XMIT_DROP;
>  }
> --
> 2.56.1.750.gf70dc682cf-goog
>

Reviewed-by: Elad Nachman <enachman@marvell.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-22  6:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-22  4:53 [PATCH net v2] net: marvell: prestera: Fix skb leak on error in prestera_rxtx_xmit() Ian Rogers
2026-11-22  6:35 ` [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