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 4C50D1DED4C; Tue, 12 May 2026 18:05:13 +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=1778609113; cv=none; b=nH1K3yIZ4nRxeb5Ru07EFlnarEFbDixvHdI0gKRzkdrJ+gSG8sJGr+D+jsV0e2F8PgBTQRzP4c//dPEKhkqtbFgL0T1YZO4R1DOWqm1HrfoNqPX9z1nc9WpMgPYavYTpNcwMcdzZYUMJ1Ps7TVTtotswQ7DH3geuSYygolxVKPw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778609113; c=relaxed/simple; bh=cvmABmWvMVw5vzwqtE8ekx2Q+GjjnlffxnPKl8O0XKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fG8knrtg3X+stsBdxfeX7OzeU9bdSio2jovwPX/U6Dcz/8ml8KLtpWJ+7ol3Q2gx338dsXRtilx2tSkD6lUTcRRlFCREuQ1wuZ8k3ouz0O3kV63x6Bozsoqhq0jX+uXsnqTPfZmKoeWH/a2gke8Abx5H0PUmYzqry4TrpfssmoQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qAByitK4; 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="qAByitK4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90981C2BCB0; Tue, 12 May 2026 18:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778609112; bh=cvmABmWvMVw5vzwqtE8ekx2Q+GjjnlffxnPKl8O0XKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qAByitK4cFMBw+SP3DSiqomQfRzVtdmg91m5lObKaWvPTWc0+7pT82UrKMhwEHQDv F1jZMubtQwewzNmimx0vsBXuR1146mPED8VKu6upUppFrv4j0TVMGwwlybKaCeQ2PB jEB5fsrf6Xy+fjj+E95msimIdWeP9+fUrilUv+JQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+5de83f57cd8531f55596@syzkaller.appspotmail.com, Jeongjun Park , Johannes Berg Subject: [PATCH 7.0 028/307] wifi: rsi: fix kthread lifetime race between self-exit and external-stop Date: Tue, 12 May 2026 19:37:03 +0200 Message-ID: <20260512173940.719652884@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173940.117428952@linuxfoundation.org> References: <20260512173940.117428952@linuxfoundation.org> User-Agent: quilt/0.69 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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeongjun Park commit db57a1aa54ff68669781976e4edb045e09e2b65b upstream. RSI driver use both self-exit(kthread_complete_and_exit) and external-stop (kthread_stop) when killing a kthread. Generally, kthread_stop() is called first, and in this case, no particular issues occur. However, in rare instances where kthread_complete_and_exit() is called first and then kthread_stop() is called, a UAF occurs because the kthread object, which has already exited and been freed, is accessed again. Therefore, to prevent this with minimal modification, you must remove kthread_stop() and change the code to wait until the self-exit operation is completed. Cc: Reported-by: syzbot+5de83f57cd8531f55596@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/69e5d03b.a00a0220.1bd0ca.0064.GAE@google.com/ Fixes: 4c62764d0fc2 ("rsi: improve kernel thread handling to fix kernel panic") Signed-off-by: Jeongjun Park Link: https://patch.msgid.link/20260422173846.37640-1-aha310510@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/rsi/rsi_common.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/net/wireless/rsi/rsi_common.h +++ b/drivers/net/wireless/rsi/rsi_common.h @@ -70,12 +70,11 @@ static inline int rsi_create_kthread(str return 0; } -static inline int rsi_kill_thread(struct rsi_thread *handle) +static inline void rsi_kill_thread(struct rsi_thread *handle) { atomic_inc(&handle->thread_done); rsi_set_event(&handle->event); - - return kthread_stop(handle->task); + wait_for_completion(&handle->completion); } void rsi_mac80211_detach(struct rsi_hw *hw);