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 8813535EFA; Mon, 4 Dec 2023 20:33:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ezGADa6m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8362C433D9; Mon, 4 Dec 2023 20:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722026; bh=AIeWwXRelijdVQAE+IrIDAn5zmzSCs+pcDzGtmCLkS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ezGADa6moBp/Mjbkoq6S2YDpnmoO1e+hu5Nyk6XZafZY42vQBEglGFecM6E3Hnp7Z ulmet4vFbbJmrsSfEvM3K4hP08cFO4MYD4Vhz6Bwcttpc7dyaZEDeqfjm4Cx3M7FT1 J5MKSxzCvUjTvWuGlgOETm4TWgiiPGHb2zZW6p6qKMqlVP1msevxGN7jUyiWs3c402 Ep7ISMkIQ+hy7Ev0iuABANehaotR35zCm7f8NXLgvWD5GJ3KjNG+2eAEwN+a4ZdR2o BlnRLRZ9D/0nWBQGSYAeEJh+7F3+EVGO3zoQ4h2dnwhxCifmUENKrjgzK1jW+eBAPu mukzFbjEXdkQw== 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.6 11/32] wifi: cfg80211: lock wiphy mutex for rfkill poll Date: Mon, 4 Dec 2023 15:32:31 -0500 Message-ID: <20231204203317.2092321-11-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit 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 563cfbe3237c9..f6ada0a729778 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -221,7 +221,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