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 0ED814D584; Mon, 1 Apr 2024 16:52:14 +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=1711990335; cv=none; b=NQru2zDjSTKimKGmHymdWVenBV5hSHU+elpLsHMk1odyJqwlV2saGol8YEh8AYqT2a/2uxOHga5GScSxqhDA3sV/lifBmOoVC+Ab9DBhddOBN75hgqz1HH9fI2HtycaaYUmXMfmjTfu47YtSJIlYrz0U/OU2HPIgdnOayDZlD7A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711990335; c=relaxed/simple; bh=7nNbRTPd3OSrNVp6bnRQyeyfjWc+oO9rvrC7Ef8NyI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pJa4e9kRmStz06fQQGsMny+myEmRAfzgGN15qngpJgEzH4HQONiO7FW8b2qN99EuDXWGDUOPNk/61ObkAtUvdAD6WXsPvfICP2BmXk+xWbHtnzIGoM60j7/7+kaEA/cSCKfj8mM8lhybXJG2lf+TK0vFO/WiOSybstnjEAKEcfA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hJVa6Reo; 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="hJVa6Reo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BD1AC433C7; Mon, 1 Apr 2024 16:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711990334; bh=7nNbRTPd3OSrNVp6bnRQyeyfjWc+oO9rvrC7Ef8NyI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hJVa6ReoGtEd+Gc2mqpHuS7Cc4VnpckBhKROCpWIPet/v49Be+3W0pD7E4LYdjPZO L9QK41HsKuv6iXIOZ8UTf7ZDO3cYJGadV5y72uMMsloZ63J16ozdMX9l2bV8gvvkhG Qkd+9YR1o7Tq7+AfTzOFKbUUiwzkS/YfAD9TjYWc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, ranygh@riseup.net, Felix Fietkau , Johannes Berg Subject: [PATCH 6.6 320/396] wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes Date: Mon, 1 Apr 2024 17:46:09 +0200 Message-ID: <20240401152557.453416257@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152547.867452742@linuxfoundation.org> References: <20240401152547.867452742@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau commit 4f2bdb3c5e3189297e156b3ff84b140423d64685 upstream. When moving a station out of a VLAN and deleting the VLAN afterwards, the fast_rx entry still holds a pointer to the VLAN's netdev, which can cause use-after-free bugs. Fix this by immediately calling ieee80211_check_fast_rx after the VLAN change. Cc: stable@vger.kernel.org Reported-by: ranygh@riseup.net Signed-off-by: Felix Fietkau Link: https://msgid.link/20240316074336.40442-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/cfg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2187,15 +2187,14 @@ static int ieee80211_change_station(stru } if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN && - sta->sdata->u.vlan.sta) { - ieee80211_clear_fast_rx(sta); + sta->sdata->u.vlan.sta) RCU_INIT_POINTER(sta->sdata->u.vlan.sta, NULL); - } if (test_sta_flag(sta, WLAN_STA_AUTHORIZED)) ieee80211_vif_dec_num_mcast(sta->sdata); sta->sdata = vlansdata; + ieee80211_check_fast_rx(sta); ieee80211_check_fast_xmit(sta); if (test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {