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 D0721C142 for ; Mon, 4 Sep 2023 18:33:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56E60C433CB; Mon, 4 Sep 2023 18:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1693852406; bh=fjm6xXFFDPsgsDCDB5jjxKYw0gEgtQZLyUYRLqCJzVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tswar8PvakIMSM1r17HAoGD2XZjK1iHlq3xSwPWq+0HFwtvYgzak/Utig3IpIs56z 0rDfLi4FkUWllcPsmqIXhVHb0wPHP47v+Fx8FCdIJ5x4gHR7vN8zHFy9/TaeYT7NSI 5ssmMgi29JiT/2CfN/nHgbj8VwIakjZ7ih9h4U5Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilgaz=20=C3=96cal?= , Sascha Hauer , Larry Finger , Ping-Ke Shih , Kalle Valo Subject: [PATCH 6.4 20/32] wifi: rtw88: usb: kill and free rx urbs on probe failure Date: Mon, 4 Sep 2023 19:30:18 +0100 Message-ID: <20230904182948.836746600@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904182947.899158313@linuxfoundation.org> References: <20230904182947.899158313@linuxfoundation.org> User-Agent: quilt/0.67 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sascha Hauer commit 290564367ab7fa7e2048bdc00d9c0ad016b41eea upstream. After rtw_usb_alloc_rx_bufs() has been called rx urbs have been allocated and must be freed in the error path. After rtw_usb_init_rx() has been called they are submitted, so they also must be killed. Add these forgotten steps to the probe error path. Besides the lost memory this also fixes a problem when the driver fails to download the firmware in rtw_chip_info_setup(). In this case it can happen that the completion of the rx urbs handler runs at a time when we already freed our data structures resulting in a kernel crash. Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") Cc: stable@vger.kernel.org Reported-by: Ilgaz Öcal Signed-off-by: Sascha Hauer Acked-by: Larry Finger Acked-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20230823075021.588596-1-s.hauer@pengutronix.de Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtw88/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -837,7 +837,7 @@ int rtw_usb_probe(struct usb_interface * ret = rtw_core_init(rtwdev); if (ret) - goto err_release_hw; + goto err_free_rx_bufs; ret = rtw_usb_intf_init(rtwdev, intf); if (ret) { @@ -883,6 +883,9 @@ err_destroy_usb: err_deinit_core: rtw_core_deinit(rtwdev); +err_free_rx_bufs: + rtw_usb_free_rx_bufs(rtwusb); + err_release_hw: ieee80211_free_hw(hw);