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 6C9B325771; Wed, 2 Oct 2024 13:19:30 +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=1727875170; cv=none; b=kRwA25og8mCfjq73X3DPfMvvosozU8R6xvjSrn70OeKwe4NA/ugqCkOi0essOnXeAfctOS8G2kPazfyUJH9S2qKhVm85JMT/olNvwehv7qx8gp01k3GUriS+CLUT0AwSyww9+HAi6nBqW0QpAiFESDn/zW3H3I9l+43h42rkJV8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875170; c=relaxed/simple; bh=tGYOfE4tkQtIW+EFIe3XVlI6sNxcYMBYsFIXoKnyMao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PWppkXhTENvlc3z221NNTsu5z0BGZJVxopqqnkGqYZPEzVz/1YuK0xhAFTqD1Bo4gees0knA01lpb6XrND6fUyb2+n8wuQh3hEch79a52N+81AWjvm+NDTHtBfEE+1DMjkadx5vGfv6cdnEvP5piAhlzkgv1tb8FyqewFGdQQ4Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V4PnY6kq; 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="V4PnY6kq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD1E3C4CEC5; Wed, 2 Oct 2024 13:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727875170; bh=tGYOfE4tkQtIW+EFIe3XVlI6sNxcYMBYsFIXoKnyMao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V4PnY6kq3Ap/IwdJKe6qh0FI7w8OKHA4TfnK2muCPogv3LwOzioC/WUA7q8bIqAuV YmAZNMWXsEiHq8dZ8qQazWrHaJcwH1LB9Zvc2Je4lSq8Jf31OFC9qIbyZaX6EOz6yx EC7S590UVQL5lj+rUBR5HYFCahQKYYW8eJWVF1c4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+6c6c08700f9480c41fe3@syzkaller.appspotmail.com, Dmitry Antipov , Ping-Ke Shih , Sasha Levin Subject: [PATCH 6.11 003/695] wifi: rtw88: always wait for both firmware loading attempts Date: Wed, 2 Oct 2024 14:50:01 +0200 Message-ID: <20241002125822.618637446@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@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-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Antipov [ Upstream commit 0e735a4c6137262bcefe45bb52fde7b1f5fc6c4d ] In 'rtw_wait_firmware_completion()', always wait for both (regular and wowlan) firmware loading attempts. Otherwise if 'rtw_usb_intf_init()' has failed in 'rtw_usb_probe()', 'rtw_usb_disconnect()' may issue 'ieee80211_free_hw()' when one of 'rtw_load_firmware_cb()' (usually the wowlan one) is still in progress, causing UAF detected by KASAN. Fixes: c8e5695eae99 ("rtw88: load wowlan firmware if wowlan is supported") Reported-by: syzbot+6c6c08700f9480c41fe3@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=6c6c08700f9480c41fe3 Signed-off-by: Dmitry Antipov Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20240726114657.25396-1-dmantipov@yandex.ru Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw88/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 7ab7a988b123f..33a7577557a56 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1313,20 +1313,21 @@ static int rtw_wait_firmware_completion(struct rtw_dev *rtwdev) { const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_fw_state *fw; + int ret = 0; fw = &rtwdev->fw; wait_for_completion(&fw->completion); if (!fw->firmware) - return -EINVAL; + ret = -EINVAL; if (chip->wow_fw_name) { fw = &rtwdev->wow_fw; wait_for_completion(&fw->completion); if (!fw->firmware) - return -EINVAL; + ret = -EINVAL; } - return 0; + return ret; } static enum rtw_lps_deep_mode rtw_update_lps_deep_mode(struct rtw_dev *rtwdev, -- 2.43.0