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 F0B1C36922D; Tue, 16 Dec 2025 12:16:20 +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=1765887381; cv=none; b=GfVq4iF5VDwP0cFzsTZ9CPBt/lI7PAsdNJWvKX/vAws5MWwox2unoZ8b7dQwUM6cFfQD7qUBcz5HOy973PjqrjSyflMcf1lIT4WBdr6k1/gdvqr4TLpegF7kuhNE8isSo7SOu5p8b3P0rPkxR/riZhgTzREXdwZsE2nBqVNhSzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765887381; c=relaxed/simple; bh=fAsSxmlGKU0ds9PssQKL53/GxZlS5nzqn2elMf2OVIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GV+P6LJNDKAtKTQlGPpjkvguv98SAqhE6jZTVUUw/XT/NDXAw0Xaocx0G8U8KBFKM2q+Mpx902Ct/iifrpI6NuqiwhwEgGsd/3nuXRlwPx18Duhw3wrsWnZAJvvE9GfZGJ+KnnGT8QYOZuRrU1dc1boxyQf95gEEi4KA+QWVfCk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=of78d9WM; 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="of78d9WM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72FE9C16AAE; Tue, 16 Dec 2025 12:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765887380; bh=fAsSxmlGKU0ds9PssQKL53/GxZlS5nzqn2elMf2OVIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=of78d9WMmUFfcG/5dJFKpP+aFx+bDITbqK4tbOgqT8Jv9sa0K4uNvBDAITCw2RPry ZMTparyc8PkvF1ej/2mzPNYIMoKAeNDs6uakbLDoVLxayN34u2u8v2aow9fpLju8Sz WsissbHiJ7SgVfqYvHAz9CXBweCPkCPy9d7BXjNs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ping-Ke Shih , Fedor Pchelkin , Sasha Levin Subject: [PATCH 6.18 213/614] wifi: rtw89: usb: use common error path for skbs in rtw89_usb_rx_handler() Date: Tue, 16 Dec 2025 12:09:40 +0100 Message-ID: <20251216111409.094110884@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fedor Pchelkin [ Upstream commit 28a45575289f3292aa9cb7bacae18ba3ee7a6adf ] Allow adding rx_skb to rx_free_queue for later reuse on the common error handling path, otherwise free it. Found by Linux Verification Center (linuxtesting.org). Fixes: 2135c28be6a8 ("wifi: rtw89: Add usb.{c,h}") Acked-by: Ping-Ke Shih Signed-off-by: Fedor Pchelkin Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20251104135720.321110-2-pchelkin@ispras.ru Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw89/usb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/usb.c b/drivers/net/wireless/realtek/rtw89/usb.c index 6cf89aee252ed..e8e064cf7e0ad 100644 --- a/drivers/net/wireless/realtek/rtw89/usb.c +++ b/drivers/net/wireless/realtek/rtw89/usb.c @@ -410,8 +410,7 @@ static void rtw89_usb_rx_handler(struct work_struct *work) if (skb_queue_len(&rtwusb->rx_queue) >= RTW89_USB_MAX_RXQ_LEN) { rtw89_warn(rtwdev, "rx_queue overflow\n"); - dev_kfree_skb_any(rx_skb); - continue; + goto free_or_reuse; } memset(&desc_info, 0, sizeof(desc_info)); @@ -422,7 +421,7 @@ static void rtw89_usb_rx_handler(struct work_struct *work) rtw89_debug(rtwdev, RTW89_DBG_HCI, "failed to allocate RX skb of size %u\n", desc_info.pkt_size); - continue; + goto free_or_reuse; } pkt_offset = desc_info.offset + desc_info.rxd_len; @@ -432,6 +431,7 @@ static void rtw89_usb_rx_handler(struct work_struct *work) rtw89_core_rx(rtwdev, &desc_info, skb); +free_or_reuse: if (skb_queue_len(&rtwusb->rx_free_queue) >= RTW89_USB_RX_SKB_NUM) dev_kfree_skb_any(rx_skb); else -- 2.51.0