From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5341236CDE0; Wed, 30 Sep 2026 16:02:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784174; cv=none; b=j20AjHach6Nal94Rb2kMqv3NJ/sUqUpH1w0mM61qy4YdCY8BlHeHEl8w6zKeo02OiweJb+4t+psaSjF1HPV+5AnO00K3bjgd7KVCePZG3t1X37uNyYubaBV/7GYwEC37Bm0hdRiiEDQrihshIvAH9gAG/cMCxtwEDqb1FHFVJko= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784174; c=relaxed/simple; bh=htHFbLoYRhg57oHJ7BoONjVCBB1GBCsV8vMjSufu6po=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QHmcI47MWW3ooJ9WlzvETy/VOK0i1Q5gcHu+CauyOMrHy3tu8LNsaOUA0gT5mEt3HaFy8sPUa+lI6X6Mt6mQkbWJ6L4n021x0941ptmqTUJSZF/gxYUZg0gkEN6j/DaXcMNL75jVG7Q7c+e2qz5g2VZqVcWkUGScQTrDU0Z2Zx8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dWOeLxFw; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dWOeLxFw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED38C1F000FF; Wed, 30 Sep 2026 16:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790784170; bh=9hAdxYj0SDi3N7clXYLe/mNkzJ9YK0mcK/ND9L7oexY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dWOeLxFwCkxmcRcekI7TmdUSfFi5PiWVEcS4Igy03gAojpgr18JGt4Kqlth57yITA uWDvIMUIvlQeyEebcdxbPjoVwdL+/DJxPm0MGWuuOUGO0MPTvz9tf8Yd5VPW4DQ3Do IUEYKnMLUDtnY5wW01DS9PSIKKB+/D6YfeQgevCQ= 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.1 059/982] wifi: mac80211: dont call ieee80211_handle_reconfig_failure when not needed Date: Wed, 30 Sep 2026 17:13:15 +0200 Message-ID: <20260930152418.063986884@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miri Korenblit [ Upstream commit 7a8a3ff2815501f78f494808355ddf37e08647d0 ] In case reconfiguration of NAN fails, we call ieee80211_handle_reconfig_failure, that marks all interfaces as not in the driver. Then, at the error path of the reconfig, cfg80211_shutdown_all_interfaces is called to destroy all the interfaces. If we have any other interface but the NAN one, for example a BSS station, then when its state (links, stations) will be removed, we won't tell the driver about this, because we will think that the interfaces are not in the driver, and then drivers might remain with dangling pointers to objects like stations and links (at least for iwlwifi this is the case). ieee80211_handle_reconfig_failure is meant to be called after we cleaned up the state in the driver, there is no reason to call it for NAN reconfiguration failure. Fix the code to just warn in such a case, as we do in other error paths in reconfig where it is too complicated to rewind. Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260513182548.6a25f3a0a6ec.I83d1f2a7eed20200a78a62757c6b193e3bab892b@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/util.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 116a3e70582be..73116ed609e1f 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2617,11 +2617,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) } break; case NL80211_IFTYPE_NAN: - res = ieee80211_reconfig_nan(sdata); - if (res < 0) { - ieee80211_handle_reconfig_failure(local); - return res; - } + WARN_ON(ieee80211_reconfig_nan(sdata)); break; case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_MONITOR: -- 2.53.0