From patchwork Thu Oct 19 11:36:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 736918 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 05A9ACDB484 for ; Thu, 19 Oct 2023 11:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345251AbjJSLhZ (ORCPT ); Thu, 19 Oct 2023 07:37:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345381AbjJSLhZ (ORCPT ); Thu, 19 Oct 2023 07:37:25 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52047131; Thu, 19 Oct 2023 04:37:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C28DEC433C8; Thu, 19 Oct 2023 11:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697715441; bh=Fl3AWQhRpM38FD8RxKjmnV0l3qxACyYQ/7kTZ5GaoTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QHLwYH8IyxMBa7gIp3HRiTFnlCMEWvzafAS97eM+kJu2uAfpF5pO+X4jo/yFxSzjj 6TUvRsAAtVX9ClOg2wiXBI2Iv0fQE85XmtzjGqlR3Eon3SNbZJGkmlxQ0ss4eEtFgq mdp4Iew5tgDMMzZSHijCxWhATPJ+3qvTnD/lsfy89a2g2eBckQg9xfJYKODEhVQc+5 SOH30zBw/W5Qe7f0MpHPP8JfCtbGQnmMesZJMSm4sMKE4J30syVf1/HPic4Hh0hZ0s PqTJG3l4Mdd8cbhUvsXlaymPHJZSbeq1nSnKsl3SIupX2Uj+fi/HnNmQ6B/cCwECgX sNeAkiBiRiy1w== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtRLB-0002Mg-07; Thu, 19 Oct 2023 13:37:25 +0200 From: Johan Hovold To: Kalle Valo Cc: Jeff Johnson , ath12k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/2] wifi: ath12k: fix dfs-radar and temperature event locking Date: Thu, 19 Oct 2023 13:36:49 +0200 Message-ID: <20231019113650.9060-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019113650.9060-1-johan+linaro@kernel.org> References: <20231019113650.9060-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The ath12k active pdevs are protected by RCU but the DFS-radar and temperature event handling code calling ath12k_mac_get_ar_by_pdev_id() was not marked as a read-side critical section. Mark the code in question as RCU read-side critical sections to avoid any potential use-after-free issues. Note that the temperature event handler looks like a place holder currently but would still trigger an RCU lockdep splat. Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices") Cc: stable@vger.kernel.org # v6.2 Signed-off-by: Johan Hovold --- drivers/net/wireless/ath/ath12k/wmi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c index ef0f3cf35cfd..1a1f57c7ac7e 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.c +++ b/drivers/net/wireless/ath/ath12k/wmi.c @@ -6476,6 +6476,7 @@ ath12k_wmi_pdev_dfs_radar_detected_event(struct ath12k_base *ab, struct sk_buff ev->detector_id, ev->segment_id, ev->timestamp, ev->is_chirp, ev->freq_offset, ev->sidx); + rcu_read_lock(); ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev->pdev_id)); if (!ar) { @@ -6493,6 +6494,8 @@ ath12k_wmi_pdev_dfs_radar_detected_event(struct ath12k_base *ab, struct sk_buff ieee80211_radar_detected(ar->hw); exit: + rcu_read_unlock(); + kfree(tb); } @@ -6511,11 +6514,14 @@ ath12k_wmi_pdev_temperature_event(struct ath12k_base *ab, ath12k_dbg(ab, ATH12K_DBG_WMI, "pdev temperature ev temp %d pdev_id %d\n", ev.temp, ev.pdev_id); + rcu_read_lock(); ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev.pdev_id)); if (!ar) { ath12k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev.pdev_id); - return; + goto exit; } +exit: + rcu_read_unlock(); } static void ath12k_fils_discovery_event(struct ath12k_base *ab, From patchwork Thu Oct 19 11:36:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 736180 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 1943ECDB486 for ; Thu, 19 Oct 2023 11:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345387AbjJSLhZ (ORCPT ); Thu, 19 Oct 2023 07:37:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345348AbjJSLhY (ORCPT ); Thu, 19 Oct 2023 07:37:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F81BBE; Thu, 19 Oct 2023 04:37:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8AC8C433CC; Thu, 19 Oct 2023 11:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697715441; bh=AlrEZPik1jxL6sdyw6sk2fh7vSfCW6AGj33Rbxfwiss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oxUv1OUW44Gy2DI6jjcgUUKlurn88h9liKBHyTR8b2U+XPsosnOfQ+S3t8uh9jOlZ +cFpbWANwm8rsYP5on73ULXaczg4UxnvN1vLyIaJpUKen2unUKqGEt45X1dBD2MBWk znEzlvO0qjoPpDuQj/l+i8JM6medNMFkAjWadX6EopLqSOv0jSqnqTmcyOWoZ8gS0X r1s5u/ZkvhlWc0qXoHPNr11M24QGsLsyxpnEj/tl/FTd6hVFb72CHLrYFfdt0lua4R 4VwiXJ+yTNAxO30U52+xcqRAseMeIMeZgn6CiZ8nOSKssNstHLskSIZNEcBpAK3IQC gdXEE5ZZHUjeQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtRLB-0002Mi-0N; Thu, 19 Oct 2023 13:37:25 +0200 From: Johan Hovold To: Kalle Valo Cc: Jeff Johnson , ath12k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/2] wifi: ath12k: fix htt mlo-offset event locking Date: Thu, 19 Oct 2023 13:36:50 +0200 Message-ID: <20231019113650.9060-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019113650.9060-1-johan+linaro@kernel.org> References: <20231019113650.9060-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The ath12k active pdevs are protected by RCU but the htt mlo-offset event handling code calling ath12k_mac_get_ar_by_pdev_id() was not marked as a read-side critical section. Mark the code in question as an RCU read-side critical section to avoid any potential use-after-free issues. Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices") Cc: stable@vger.kernel.org # v6.2 Signed-off-by: Johan Hovold Acked-by: Jeff Johnson --- drivers/net/wireless/ath/ath12k/dp_rx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c index e6e64d437c47..3294625650dc 100644 --- a/drivers/net/wireless/ath/ath12k/dp_rx.c +++ b/drivers/net/wireless/ath/ath12k/dp_rx.c @@ -1641,11 +1641,12 @@ static void ath12k_htt_mlo_offset_event_handler(struct ath12k_base *ab, msg = (struct ath12k_htt_mlo_offset_msg *)skb->data; pdev_id = u32_get_bits(__le32_to_cpu(msg->info), HTT_T2H_MLO_OFFSET_INFO_PDEV_ID); - ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id); + rcu_read_lock(); + ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id); if (!ar) { ath12k_warn(ab, "invalid pdev id %d on htt mlo offset\n", pdev_id); - return; + goto exit; } spin_lock_bh(&ar->data_lock); @@ -1661,6 +1662,8 @@ static void ath12k_htt_mlo_offset_event_handler(struct ath12k_base *ab, pdev->timestamp.mlo_comp_timer = __le32_to_cpu(msg->mlo_comp_timer); spin_unlock_bh(&ar->data_lock); +exit: + rcu_read_unlock(); } void ath12k_dp_htt_htc_t2h_msg_handler(struct ath12k_base *ab,