From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 901FFC4167B for ; Mon, 4 Dec 2023 20:38:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346153AbjLDUiY (ORCPT ); Mon, 4 Dec 2023 15:38:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345987AbjLDUht (ORCPT ); Mon, 4 Dec 2023 15:37:49 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB07035AC for ; Mon, 4 Dec 2023 12:35:31 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67E5CC433C9; Mon, 4 Dec 2023 20:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722131; bh=LU4+1EHq4WENMk/lHIrrrZCo/Q9lqbk3KKLoRBbHvM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8yC/i+6dP2Z713RUQPZutcX1cGM3zSR4+wtkjpZ2CMOYrF8ozGYAJNg5aw+6qC/2 aWz5DRTkjk3ZPpaKXnZvprUZ6xfXut1a4ITmuO0+O4TY8uXEaVHKnxBDQIEbN6123E WTAeoBO59P9+Er4Rj+p6fGThIIFJoxygf5urK0yHElEjmEa4nqkEH0/Hd9GDKdfqPI z8Zwk6IxprHPNsfXSgnXD64uzX1Yxsw2xb8zPzZ9Z4wB41cDikwuCl0wJbopkGtiFV KH3KKL/p4TiD3wjMgT5w36wJK+o7X8ycSsQQTyk0+xVNQrMX6nFz3z9dSph6Nz16bR +BYRMU8XW074A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , syzbot+7e59a5bfc7a897247e18@syzkaller.appspotmail.com, Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 05/17] wifi: cfg80211: lock wiphy mutex for rfkill poll Date: Mon, 4 Dec 2023 15:34:50 -0500 Message-ID: <20231204203514.2093855-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203514.2093855-1-sashal@kernel.org> References: <20231204203514.2093855-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.65 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 8e2f6f2366219b3304b227bdd2f04b64c92e3e12 ] We want to guarantee the mutex is held for pretty much all operations, so ensure that here as well. Reported-by: syzbot+7e59a5bfc7a897247e18@syzkaller.appspotmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/wireless/core.c b/net/wireless/core.c index 63d75fecc2c53..8809e668ed912 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -216,7 +216,9 @@ static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data) { struct cfg80211_registered_device *rdev = data; + wiphy_lock(&rdev->wiphy); rdev_rfkill_poll(rdev); + wiphy_unlock(&rdev->wiphy); } void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, -- 2.42.0