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 4411A2566 for ; Tue, 18 Apr 2023 12:28:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE205C433EF; Tue, 18 Apr 2023 12:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681820889; bh=bBWI9P1bT7+Gmfl32gxt6tI7vcQ21ymmUGy2KqlEWug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYFgs1YUI6m4ZzZRrDkW34EiUY/Ww/BqLrxFIaPiWrOkhY76qJOx/swuETzNJ79rt fzjSzmByZpcqqwVE9WY/faG6xXty+AtL38WURm/IDWb4lU5i6uwG6RQgjfki+6oKAu 41nhtcLhBzBrXyxqiJ6/Qjh1MYKXsc/Pxl9bvmP0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Brian Coverstone , Felix Fietkau , Johannes Berg , Sasha Levin Subject: [PATCH 5.4 12/92] wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta Date: Tue, 18 Apr 2023 14:20:47 +0200 Message-Id: <20230418120305.206590210@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230418120304.658273364@linuxfoundation.org> References: <20230418120304.658273364@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Felix Fietkau [ Upstream commit 12b220a6171faf10638ab683a975cadcf1a352d6 ] Avoid potential data corruption issues caused by uninitialized driver private data structures. Reported-by: Brian Coverstone Fixes: 6a9d1b91f34d ("mac80211: add pre-RCU-sync sta removal driver operation") Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20230324120924.38412-3-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/sta_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 4d6890250337d..0f97c6fcec174 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1023,7 +1023,8 @@ static int __must_check __sta_info_destroy_part1(struct sta_info *sta) list_del_rcu(&sta->list); sta->removed = true; - drv_sta_pre_rcu_remove(local, sta->sdata, sta); + if (sta->uploaded) + drv_sta_pre_rcu_remove(local, sta->sdata, sta); if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && rcu_access_pointer(sdata->u.vlan.sta) == sta) -- 2.39.2