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 3C6F83770B; Thu, 17 Apr 2025 18:43:39 +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=1744915419; cv=none; b=N1xqE3vt0tu9bLfJeHLl7NS20Zi0x1MmOtruxK0Q8nmAO7ajXbpMkfhDfsdhwUUlS7e4bth7WSjGC6xfV4sGXvmqnpkYywNIlmu/TuYIbUT/ScBhGZCALBeGBjUtIKIYoZVgTxbTc5jNtJZXU6oROeqmvp89MGFCM0gyMYkSmts= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744915419; c=relaxed/simple; bh=23Nf/etwXumzRwqbpK5MKAzs1Fn+YmiHI2CdSDqAXnE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FoKgHlokGNkhLoZuIIrylriftuMV71XHrSeYE9jCnXkMDUbeuPKNjOVGy1XmMIwo5TH8swpucvlOxXwj83ROnJm4Sv7U9bML2AkD3gA4jORbh5z/WfIpmfrzDt5/S58myB68OJFsdwlnt9zlldRxUmkaou+ovh5QZxa2asWkIb4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LPIOv6jz; 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="LPIOv6jz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAA76C4CEE4; Thu, 17 Apr 2025 18:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744915419; bh=23Nf/etwXumzRwqbpK5MKAzs1Fn+YmiHI2CdSDqAXnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LPIOv6jzn7aY83ffq5yTXvaogcuokoJLix5Wj1dfzRJFDyXvtjkJPi+j5mYaaKL4D M9tI083hzC/gsAqRfaBMIUcn87oSN/ZTGTVwJmUN3eqiM1riyYbjeNBLbB88TPjhoN kV+jsveye52hr3hzcWPfIltUhFYbnisJFIrIlFYw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 6.12 092/393] wifi: mac80211: ensure sdata->work is canceled before initialized. Date: Thu, 17 Apr 2025 19:48:21 +0200 Message-ID: <20250417175111.295202764@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175107.546547190@linuxfoundation.org> References: <20250417175107.546547190@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miri Korenblit [ Upstream commit 6c93fd502023dd919b5987ccbe990735410edd49 ] This wiphy work is canceled when the iface is stopped, and shouldn't be queued for a non-running iface. If it happens to be queued for a non-running iface (due to a bug) it can cause a corruption of wiphy_work_list when ieee80211_setup_sdata is called. Make sure to cancel it in this case and warn on. Signed-off-by: Miri Korenblit Reviewed-by: Johannes Berg Link: https://patch.msgid.link/20250205110958.99204c767c10.I84ce27a239059f6009cee197b252549a11426046@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/iface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 8bbfa45e1796d..dbcd75c5d778e 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -8,7 +8,7 @@ * Copyright 2008, Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (c) 2016 Intel Deutschland GmbH - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation */ #include #include @@ -812,6 +812,9 @@ static void ieee80211_set_multicast_list(struct net_device *dev) */ static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata) { + if (WARN_ON(!list_empty(&sdata->work.entry))) + wiphy_work_cancel(sdata->local->hw.wiphy, &sdata->work); + /* free extra data */ ieee80211_free_keys(sdata, false); -- 2.39.5