From patchwork Mon Mar 20 13:36:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 13181270 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76A48C7618A for ; Mon, 20 Mar 2023 13:37:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231732AbjCTNhh (ORCPT ); Mon, 20 Mar 2023 09:37:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231443AbjCTNhY (ORCPT ); Mon, 20 Mar 2023 09:37:24 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D15DE2470B; Mon, 20 Mar 2023 06:37:18 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so12445423pjb.0; Mon, 20 Mar 2023 06:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679319438; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MdCkHnCKj4WxKKgtdRV6cXLUY/SN5CblWEdzRCWbv3w=; b=aCsQBItgL7rYZVVavtmZ8FLX0aD4pxV16VYWD7jGIUvCioofzSwPG7YiYhvMlpJTTS K3LXrXhXlX3kpyPzmCkX364nCde0xwhP+awzvB4EHIqsMkURmxmf4NHx58xSq2bIxMum ooEVR7pnA8jUjJbiQhf/R+7PBDgebXtzUiqLCZ99APu4Qd8jilD8FlPM5uKHOkD4azIH bPIfcx+civh2qo/iEPQ9V1A88m1oyDBgCCyYv3t0c9QYC2IKYzqQSdF88ytx8fJgtfuw yhppThyuBX/16hkIU/mnMlGBGPhefNklXtQTqP+YWtLU1obJsD/YmfkK/2EMMJ7lstRQ a1mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319438; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MdCkHnCKj4WxKKgtdRV6cXLUY/SN5CblWEdzRCWbv3w=; b=1fVBR6fy6BeuHkWGWIa+70TLSbNdBjm2HsmZ2iUQbfBkpCWh4Xf0X9KP/JqMFLnejT M+V7bwSHtu/4S0SLnBYNTD7msGPUADW9cjPq7FUTJad1WsHRhIMsVljqp1New+f3gB72 GPUo14XxAmP1fIG53TZDfdFU913ljViSuu1I9JWllMOfkwxsmru2ENOqJ0oB4qnSHQcQ 3AFbzhvsAkwQ9Zbps+YDWZ/goIxNXa2iyFXL2vmRDh1PVGOVYWa8ukWJemttRACo9vnN SJF/LpUshrCoE2TlMjQhVYEdjIbVt86elAMJu5QqmTwgK19Tb5XY3TGRV9c4Tpne+Vfn eMTQ== X-Gm-Message-State: AO0yUKVLDexgm2TpJOD/i3u8vkaGnMAUsIBToWuDA0PHSmFF5bLIXiZC nAyMnGccSBcsnDctr2BfJGw= X-Google-Smtp-Source: AK7set+SfniZ1Jc6b7s2Hh/s9rzwZ8Mj5ijFU92/DCT+En5Dw+qToJpmpnvZW7Hkc5IP2UlA6nKN9w== X-Received: by 2002:a17:90a:1a49:b0:23f:10ee:feef with SMTP id 9-20020a17090a1a4900b0023f10eefeefmr19528672pjl.19.1679319438369; Mon, 20 Mar 2023 06:37:18 -0700 (PDT) Received: from oslab.. ([106.39.42.159]) by smtp.gmail.com with ESMTPSA id n4-20020a17090ac68400b0023d1b9e17e2sm6118592pjt.31.2023.03.20.06.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 06:36:54 -0700 (PDT) From: Jia-Ju Bai To: johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH] net: mac80211: Add NULL checks for sta->sdata Date: Mon, 20 Mar 2023 21:36:44 +0800 Message-Id: <20230320133644.2445321-1-baijiaju1990@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jia-Ju Bai In a previous commit 69403bad97aa, sta->sdata can be NULL, and thus it should be checked before being used. However, in the same call stack, sta->sdata is also used in the following functions: ieee80211_ba_session_work() ___ieee80211_stop_rx_ba_session(sta) ht_dbg(sta->sdata, ...); -> No check sdata_info(sta->sdata, ...); -> No check ieee80211_send_delba(sta->sdata, ...) -> No check ___ieee80211_start_rx_ba_session(sta) ht_dbg(sta->sdata, ...); -> No check ht_dbg_ratelimited(sta->sdata, ...); -> No check ieee80211_tx_ba_session_handle_start(sta) sdata = sta->sdata; if (!sdata) -> Add check by previous commit ___ieee80211_stop_tx_ba_session(sdata) ht_dbg(sta->sdata, ...); -> No check ieee80211_start_tx_ba_cb(sdata) sdata = sta->sdata; local = sdata->local -> No check ieee80211_stop_tx_ba_cb(sdata) ht_dbg(sta->sdata, ...); -> No check Thus, to avoid possible null-pointer dereferences, the related checks should be added. These results are reported by a static tool designed by myself. Signed-off-by: Jia-Ju Bai --- net/mac80211/agg-rx.c | 68 ++++++++++++++++++++++++++----------------- net/mac80211/agg-tx.c | 16 ++++++++-- 2 files changed, 55 insertions(+), 29 deletions(-) diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index c6fa53230450..6616970785a2 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -80,19 +80,21 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL); __clear_bit(tid, sta->ampdu_mlme.agg_session_valid); - ht_dbg(sta->sdata, - "Rx BA session stop requested for %pM tid %u %s reason: %d\n", - sta->sta.addr, tid, - initiator == WLAN_BACK_RECIPIENT ? "recipient" : "initiator", - (int)reason); + if (sta->sdata) { + ht_dbg(sta->sdata, + "Rx BA session stop requested for %pM tid %u %s reason: %d\n", + sta->sta.addr, tid, + initiator == WLAN_BACK_RECIPIENT ? "recipient" : "initiator", + (int)reason); + } - if (drv_ampdu_action(local, sta->sdata, ¶ms)) + if (sta->sdata && drv_ampdu_action(local, sta->sdata, ¶ms)) sdata_info(sta->sdata, "HW problem - can not stop rx aggregation for %pM tid %d\n", sta->sta.addr, tid); /* check if this is a self generated aggregation halt */ - if (initiator == WLAN_BACK_RECIPIENT && tx) + if (initiator == WLAN_BACK_RECIPIENT && tx && sta->sdata) ieee80211_send_delba(sta->sdata, sta->sta.addr, tid, WLAN_BACK_RECIPIENT, reason); @@ -279,17 +281,21 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, if (!sta->sta.deflink.ht_cap.ht_supported && !sta->sta.deflink.he_cap.has_he) { - ht_dbg(sta->sdata, - "STA %pM erroneously requests BA session on tid %d w/o HT\n", - sta->sta.addr, tid); + if (sta->sdata) { + ht_dbg(sta->sdata, + "STA %pM erroneously requests BA session on tid %d w/o HT\n", + sta->sta.addr, tid); + } /* send a response anyway, it's an error case if we get here */ goto end; } if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) { - ht_dbg(sta->sdata, - "Suspend in progress - Denying ADDBA request (%pM tid %d)\n", - sta->sta.addr, tid); + if (sta->sdata) { + ht_dbg(sta->sdata, + "Suspend in progress - Denying ADDBA request (%pM tid %d)\n", + sta->sta.addr, tid); + } goto end; } @@ -322,8 +328,10 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, buf_size = sta->sta.max_rx_aggregation_subframes; params.buf_size = buf_size; - ht_dbg(sta->sdata, "AddBA Req buf_size=%d for %pM\n", - buf_size, sta->sta.addr); + if (sta->sdata) { + ht_dbg(sta->sdata, "AddBA Req buf_size=%d for %pM\n", + buf_size, sta->sta.addr); + } /* examine state machine */ lockdep_assert_held(&sta->ampdu_mlme.mtx); @@ -332,9 +340,11 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, if (sta->ampdu_mlme.tid_rx_token[tid] == dialog_token) { struct tid_ampdu_rx *tid_rx; - ht_dbg_ratelimited(sta->sdata, - "updated AddBA Req from %pM on tid %u\n", - sta->sta.addr, tid); + if (sta->sdata) { + ht_dbg_ratelimited(sta->sdata, + "updated AddBA Req from %pM on tid %u\n", + sta->sta.addr, tid); + } /* We have no API to update the timeout value in the * driver so reject the timeout update if the timeout * changed. If it did not change, i.e., no real update, @@ -350,9 +360,11 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, goto end; } - ht_dbg_ratelimited(sta->sdata, - "unexpected AddBA Req from %pM on tid %u\n", - sta->sta.addr, tid); + if (sta->sdata) { + ht_dbg_ratelimited(sta->sdata, + "unexpected AddBA Req from %pM on tid %u\n", + sta->sta.addr, tid); + } /* delete existing Rx BA session on the same tid */ ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT, @@ -362,9 +374,11 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, if (ieee80211_hw_check(&local->hw, SUPPORTS_REORDERING_BUFFER)) { ret = drv_ampdu_action(local, sta->sdata, ¶ms); - ht_dbg(sta->sdata, - "Rx A-MPDU request on %pM tid %d result %d\n", - sta->sta.addr, tid, ret); + if (sta->sdata) { + ht_dbg(sta->sdata, + "Rx A-MPDU request on %pM tid %d result %d\n", + sta->sta.addr, tid, ret); + } if (!ret) status = WLAN_STATUS_SUCCESS; goto end; @@ -401,8 +415,10 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, __skb_queue_head_init(&tid_agg_rx->reorder_buf[i]); ret = drv_ampdu_action(local, sta->sdata, ¶ms); - ht_dbg(sta->sdata, "Rx A-MPDU request on %pM tid %d result %d\n", - sta->sta.addr, tid, ret); + if (sta->sdata) { + ht_dbg(sta->sdata, "Rx A-MPDU request on %pM tid %d result %d\n", + sta->sta.addr, tid, ret); + } if (ret) { kfree(tid_agg_rx->reorder_buf); kfree(tid_agg_rx->reorder_time); diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index f9514bacbd4a..03b31b6e7ac7 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -368,8 +368,10 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, spin_unlock_bh(&sta->lock); - ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n", - sta->sta.addr, tid); + if (sta->sdata) { + ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n", + sta->sta.addr, tid); + } del_timer_sync(&tid_tx->addba_resp_timer); del_timer_sync(&tid_tx->session_timer); @@ -776,7 +778,12 @@ void ieee80211_start_tx_ba_cb(struct sta_info *sta, int tid, struct tid_ampdu_tx *tid_tx) { struct ieee80211_sub_if_data *sdata = sta->sdata; - struct ieee80211_local *local = sdata->local; + struct ieee80211_local *local; + + if (!sdata) + return; + + local = sdata->local; if (WARN_ON(test_and_set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state))) return; @@ -902,6 +909,9 @@ void ieee80211_stop_tx_ba_cb(struct sta_info *sta, int tid, bool send_delba = false; bool start_txq = false; + if (!sdata) + return; + ht_dbg(sdata, "Stopping Tx BA session for %pM tid %d\n", sta->sta.addr, tid);