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 D9AC52188E7; Wed, 25 Sep 2024 12:13:15 +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=1727266396; cv=none; b=VWlZnCbtXMwsUjndh5sJJZToH9RrvTQy8EmbVHc5SafMC6DZyEOX76N3C+80ITBuLzUkkgJZLPoViprZsPBusAimHEE0ULsOeOZ4E0eHlWbTz+FcJ3APq0AtVtilorsjPphcMmHXcd7iCtt/zzTofO/8unA9+UrvFGw65cRjEHg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266396; c=relaxed/simple; bh=dud/DxXjNofOsAwrAwT2KLGOnJNEyrKFlTDOnpdvlFs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PxLwcLoYhMDovnltSQ104gs9OrVJ81ws6QU1NCIrXUEDJ7qNyQeot0f33/O8L54H0ThId96DeZvdLza89qGmvsKfKWw5DM4FjEfYATeNuVIQDQ/o6LEpOsyiX9UmymrsYTufxO/ickQ0hm1IqL3QrKkwUzY0brap40OVWzThAv0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vF34Jdxb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vF34Jdxb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEA87C4CEC3; Wed, 25 Sep 2024 12:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266395; bh=dud/DxXjNofOsAwrAwT2KLGOnJNEyrKFlTDOnpdvlFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vF34JdxbIIpi8YjFzYt9I0+KAWTD/+9FiHf1kJa1pliqTGxL/28uWC0gPT+piauX0 DHF7P33Y5u5Yzz/cC513ckmkH7iqYhjulRKVHEv+1us1LKMlNo1hIq1ZVFf/97B45Q QjswTUShdHrOtsOyD5ZIhPgfdnaWRXJpKU3V6Ln7Fv9OHB4CgLRmyHkJyb5BZKKjPk 2Qu1exVgJsSOubkd1+0xw+J74o2ujeYOo3AxzaD0jejcapVw2mRbRs9vtim+8rvAYB zRf9FnMQEvWr/DISpHFCD7Qv+GS9UT5fcdjMu8GTxOM/tTI4kR3uO0W/nQcOZIH935 ptGJXxLjglkSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, gregory.greenman@intel.com, edumazet@google.com, davem@davemloft.net, shaul.triebitz@intel.com, daniel.gabay@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 045/139] wifi: iwlwifi: mvm: avoid NULL pointer dereference Date: Wed, 25 Sep 2024 08:07:45 -0400 Message-ID: <20240925121137.1307574-45-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925121137.1307574-1-sashal@kernel.org> References: <20240925121137.1307574-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.52 Content-Transfer-Encoding: 8bit From: Miri Korenblit [ Upstream commit 557a6cd847645e667f3b362560bd7e7c09aac284 ] iwl_mvm_tx_skb_sta() and iwl_mvm_tx_mpdu() verify that the mvmvsta pointer is not NULL. It retrieves this pointer using iwl_mvm_sta_from_mac80211, which is dereferencing the ieee80211_sta pointer. If sta is NULL, iwl_mvm_sta_from_mac80211 will dereference a NULL pointer. Fix this by checking the sta pointer before retrieving the mvmsta from it. If sta is not NULL, then mvmsta isn't either. Signed-off-by: Miri Korenblit Reviewed-by: Johannes Berg Link: https://patch.msgid.link/20240825191257.880921ce23b7.I340052d70ab6d3410724ce955eb00da10e08188f@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 3adb1acc07191..ce5f2bdde1388 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -1145,6 +1145,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, bool is_ampdu = false; int hdrlen; + if (WARN_ON_ONCE(!sta)) + return -1; + mvmsta = iwl_mvm_sta_from_mac80211(sta); fc = hdr->frame_control; hdrlen = ieee80211_hdrlen(fc); @@ -1152,9 +1155,6 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, if (IWL_MVM_NON_TRANSMITTING_AP && ieee80211_is_probe_resp(fc)) return -1; - if (WARN_ON_ONCE(!mvmsta)) - return -1; - if (WARN_ON_ONCE(mvmsta->deflink.sta_id == IWL_MVM_INVALID_STA)) return -1; @@ -1285,7 +1285,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, struct ieee80211_sta *sta) { - struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta); + struct iwl_mvm_sta *mvmsta; struct ieee80211_tx_info info; struct sk_buff_head mpdus_skbs; struct ieee80211_vif *vif; @@ -1294,9 +1294,11 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, struct sk_buff *orig_skb = skb; const u8 *addr3; - if (WARN_ON_ONCE(!mvmsta)) + if (WARN_ON_ONCE(!sta)) return -1; + mvmsta = iwl_mvm_sta_from_mac80211(sta); + if (WARN_ON_ONCE(mvmsta->deflink.sta_id == IWL_MVM_INVALID_STA)) return -1; -- 2.43.0