From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CF281B0420; Tue, 26 Aug 2025 12:57:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756213051; cv=none; b=S/kY5sY2D8DvT/ufMxhPaN3REdFT4KB7GOmuY72bywpBG7IQIEwLC6eVyVYudcyqMSLOUe1y65JQ5h4MijyReenr+Uvfsv6PMtrpS1Qgurze8yzxi/DXIRd+vjjpVHkyrEspc0ofd2ZwKUeM2m+55yaRDBEJA2zDyWF5u4LUj1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756213051; c=relaxed/simple; bh=Hu4hS/9B+gFUbEdBF3gQzW6VT0KLGjeTqSJ8qjMKcH4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hPu8YxEtgC2G9H2tpbsAZW1ADDJDMI138PYfP0naz9kAFG0Bjp87AsFsx+lo/ZIfA74igRXzmS8yA37k/yNQwALbWPhc/ZJRFi8nQ2jx2aIFYpCwhTyjAFmBWKQLvijIeOjNme4D2DMJJnaJnr3KRzPYzdks9E4U2qR6r8ovkY4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kAv+ZLqp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kAv+ZLqp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B48EFC4CEF1; Tue, 26 Aug 2025 12:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756213051; bh=Hu4hS/9B+gFUbEdBF3gQzW6VT0KLGjeTqSJ8qjMKcH4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kAv+ZLqpfu1hQlee2GdMqNuMyLuoelEgzURbejLacgUp6AGKSR9KVcthOPPmMMa9q t1gmHnYJ1NeRSL/tKskwwo+a5GnG34oEp9Er2yw+IvssgYQkzueeBSJX4tuf+AbFnN lPU/Etl0xAmjMGSaCGl/GAi2WYTq4lEsFOlRa3Ok= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Ping-Ke Shih , Sasha Levin Subject: [PATCH 6.6 203/587] wifi: rtlwifi: fix possible skb memory leak in _rtl_pci_init_one_rxdesc() Date: Tue, 26 Aug 2025 13:05:52 +0200 Message-ID: <20250826110958.103391229@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110952.942403671@linuxfoundation.org> References: <20250826110952.942403671@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit 76b3e5078d76f0eeadb7aacf9845399f8473da0d ] When `dma_mapping_error()` is true, if a new `skb` has been allocated, then it must be de-allocated. Compile tested only Signed-off-by: Thomas Fourier Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20250613074014.69856-2-fourier.thomas@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtlwifi/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index 6264ef7805d6..40112b2c3777 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -573,8 +573,11 @@ static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw, dma_map_single(&rtlpci->pdev->dev, skb_tail_pointer(skb), rtlpci->rxbuffersize, DMA_FROM_DEVICE); bufferaddress = *((dma_addr_t *)skb->cb); - if (dma_mapping_error(&rtlpci->pdev->dev, bufferaddress)) + if (dma_mapping_error(&rtlpci->pdev->dev, bufferaddress)) { + if (!new_skb) + kfree_skb(skb); return 0; + } rtlpci->rx_ring[rxring_idx].rx_buf[desc_idx] = skb; if (rtlpriv->use_new_trx_flow) { /* skb->cb may be 64 bit address */ -- 2.39.5