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 5E9CA350D7A; Tue, 26 Aug 2025 13:52:27 +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=1756216347; cv=none; b=NMK3aS1msQb0l0H7I3BHk0UqeYnh4861VeGuHOtSX/eBJp1mUqwi4bCo+GxSLFXRgd/WOgG6VYFjVQfjDcK6yzVAx/GbjONbjG0OBn1LYrSz1Qs613lB0whj5+nIFHjuQ0P8UD4jNwQehWthSEclAONiUCRdPM3GE/ZY5OX0cd4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216347; c=relaxed/simple; bh=DuHGLERMsLHXCcujhJ//Jqza6GuU8Y37c5ZOefcD+jQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l88kOrZwbiL5T96z45lJk6iWSosLCizXcIZiqzRnPesL55W2RLP0xqmBZMKiMJLmv5wqljMvk5Av4pYE323aJeHYywTkrhH9Qq4ylJmDDtNUfkGrDz9EbpwLx0TAHRAmdyGYy6ceMDx0AbS5xRxiCOlhFD1b47PyFtoe8htRJew= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LYnHg3fM; 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="LYnHg3fM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3984C113D0; Tue, 26 Aug 2025 13:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756216347; bh=DuHGLERMsLHXCcujhJ//Jqza6GuU8Y37c5ZOefcD+jQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYnHg3fMD2wi2NBb7lGQ5wiDjUpQDk9N6RWLb3xkyfhej1DmhJuKSIakdrMTTFXQc qix4OwvS5vcQmJj36lAGKdUbpTDFkir6qK7hcxNunJIvZWVDlmoPsEF9J01dcD8DER Tjtu8rcjtfYThSktflWqrFWJmpxVc6obLJ3r/Lcc= 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 5.15 376/644] wifi: rtlwifi: fix possible skb memory leak in _rtl_pci_init_one_rxdesc() Date: Tue, 26 Aug 2025 13:07:47 +0200 Message-ID: <20250826110955.738581265@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110946.507083938@linuxfoundation.org> References: <20250826110946.507083938@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 5.15-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 bccb959d8210..02821588673e 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