mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ian Rogers <irogers@google.com>
To: Ajay Singh <ajay.kathat@microchip.com>,
	Claudiu Beznea <claudiu.beznea@tuxon.dev>
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
	 llvm@lists.linux.dev, Elkin Cruz <elkin@google.com>,
	Ian Rogers <irogers@google.com>
Subject: [PATCH] wifi: wilc1000: Fix skb leaks and return types in wilc_wfi_mon_xmit()
Date: Thu, 19 Nov 2026 09:07:35 -0800	[thread overview]
Message-ID: <20261119170735.1524873-1-irogers@google.com> (raw)

wilc_wfi_mon_xmit() is an .ndo_start_xmit handler returning netdev_tx_t,
where negative return codes (< NET_XMIT_MASK) are treated by
dev_xmit_complete() as packets already consumed by the driver:

1. On the broadcast deauthentication path, if dev_alloc_skb() fails it
   returns -ENOMEM without freeing skb; if dev_alloc_skb() succeeds, it
   copies skb->data into skb2, passes skb2 to netif_rx(), and returns 0
   without ever freeing the original skb.
2. On the management frame path, mon_mgmt_tx() returns a negative errno on
   allocation failure, which was stored in u32 'ret' and returned as
   netdev_tx_t after freeing skb.

Free skb via 'goto drop' on skb2 allocation failure, consume skb with
dev_consume_skb_any() after cloning into skb2, remove the impossible
!netdev_priv(dev) check, and return explicit netdev_tx_t values across all
paths.

Found via an x86_64 LLVM=1 (Clang 21.1.8) allyesconfig audit with
-Wassign-enum enabled; fix and changelog drafted with an AI coding
assistant. Build-tested under LLVM=1 W=1 (-Werror), -Wassign-enum, and
-Wimplicit-int-enum-cast; not tested on Microchip WILC1000 hardware.

Fixes: 5625f965d764 ("wilc1000: move wilc driver out of staging")
Signed-off-by: Ian Rogers <irogers@google.com>
---
 drivers/net/wireless/microchip/wilc1000/mon.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/mon.c b/drivers/net/wireless/microchip/wilc1000/mon.c
index 9b8c083b403d..8bee46651c61 100644
--- a/drivers/net/wireless/microchip/wilc1000/mon.c
+++ b/drivers/net/wireless/microchip/wilc1000/mon.c
@@ -145,16 +145,15 @@ static netdev_tx_t wilc_wfi_mon_xmit(struct sk_buff *skb,
 	struct ieee80211_radiotap_header_fixed *rtap_hdr;
 	struct ieee80211_hdr_3addr *hdr;
 	unsigned int hdr_len;
-	u32 rtap_len, ret = 0;
+	u32 rtap_len;
 	struct wilc_wfi_mon_priv  *mon_priv;
 	struct sk_buff *skb2;
 	struct wilc_wfi_radiotap_cb_hdr *cb_hdr;
 	u8 srcadd[ETH_ALEN];
 	u8 bssid[ETH_ALEN];
+	int err;
 
 	mon_priv = netdev_priv(dev);
-	if (!mon_priv)
-		return -EFAULT;
 
 	if (skb->len < sizeof(*rtap_hdr))
 		goto drop;
@@ -178,7 +177,7 @@ static netdev_tx_t wilc_wfi_mon_xmit(struct sk_buff *skb,
 	    is_broadcast_ether_addr(hdr->addr1)) {
 		skb2 = dev_alloc_skb(skb->len + sizeof(*cb_hdr));
 		if (!skb2)
-			return -ENOMEM;
+			goto drop;
 
 		skb_put_data(skb2, skb->data, skb->len);
 
@@ -202,8 +201,9 @@ static netdev_tx_t wilc_wfi_mon_xmit(struct sk_buff *skb,
 		memset(skb2->cb, 0, sizeof(skb2->cb));
 
 		netif_rx(skb2);
+		dev_consume_skb_any(skb);
 
-		return 0;
+		return NETDEV_TX_OK;
 	}
 	skb->dev = mon_priv->real_ndev;
 
@@ -214,15 +214,14 @@ static netdev_tx_t wilc_wfi_mon_xmit(struct sk_buff *skb,
 	 * fields are equal send it to mgmt frames handler
 	 */
 	if (!(memcmp(srcadd, bssid, 6))) {
-		ret = mon_mgmt_tx(mon_priv->real_ndev, skb->data, skb->len);
-		if (ret)
+		err = mon_mgmt_tx(mon_priv->real_ndev, skb->data, skb->len);
+		if (err)
 			netdev_err(dev, "fail to mgmt tx\n");
 		dev_kfree_skb(skb);
-	} else {
-		ret = wilc_mac_xmit(skb, mon_priv->real_ndev);
+		return NETDEV_TX_OK;
 	}
 
-	return ret;
+	return wilc_mac_xmit(skb, mon_priv->real_ndev);
 
 drop:
 	dev_kfree_skb(skb);
-- 
2.56.1.708.g77570a6a1d-goog


                 reply	other threads:[~2026-11-19 17:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20261119170735.1524873-1-irogers@google.com \
    --to=irogers@google.com \
    --cc=ajay.kathat@microchip.com \
    --cc=claudiu.beznea@tuxon.dev \
    --cc=elkin@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    /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®