From patchwork Thu Oct 19 11:25:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 155445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp312303vqb; Thu, 19 Oct 2023 04:26:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHQWyoJXQBY7QfdY/2QKn8HOwESATB+bwrQVHojfsbDIgCCmnafnIUBXkvjx/oUvxB6KZbd X-Received: by 2002:a05:6870:118a:b0:1ea:d476:d018 with SMTP id 10-20020a056870118a00b001ead476d018mr756666oau.39.1697714770497; Thu, 19 Oct 2023 04:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697714770; cv=none; d=google.com; s=arc-20160816; b=RI0AUwIEJbiGoCb6KNHcbt/RUx5ONfFjLYc98mon3Q0IMXk9/DfJro4TiJVAN2voK/ pa9YR4L6g6mdKBeeckLWBEBp9GeDmstMoR7bduWWrTWzPcM5eNe0SoqOQ+7/GZk00Adf ld/UpAG0oO7YgOCiFTAvCGgP9Fh3TNFRiGRsWdrPCnO+rNO3XZokNoAr07xAi36GWmfL FP68xNr5dFyRXESF1l/PtNB7zlgHWnwbZYf6u4U9MVmf3zzBu4nJWIC4a3YW90xfgbDX 84HmWJmQoBfI8Nqqai4uNKwkcE47wkzLtsM2JtJwwRESj2TsUfdrYdt2Ff/EuysEPvf8 EUbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=C3PjLXT81OSAcXJ/CnviY7cNUurVZRUmCOKYVi4P5ag=; fh=wVjIh4Ry7X7gqxD7x4+f60lKPnJwP7xEuzok5FQ1a8Q=; b=Fc6yBUQb+ZZwmczOwR2VLrgqeVWzJ2n7TPrW+mIqZ00VXWCuoeP+FeebYAf/wAUAIR eDms9uqjFnoB277e1TH6mdW6LiA2fK0u9CWIvfIInDRMO5q93soP/dQaXWM8uq1f31zW +y6gkZqI1NvKA8X2nv6psQPnBKDMBfejj3oQe8+fSllrGr2vPoY6GXuKRd8QigDzGYvY ZzH4iy9J1BB5+qpyTaKaG9287aB+YkU6HVxSbhYXMLY8ZcL+ckSyijMiPrkXbbJKKfYZ P54rJju8Rigpp+8napt2bRdE9Pd7dG40iml9x6U93TzOUvUsBMVdUwPET2QJJEml7Nx+ T9xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iFvREIZt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u185-20020a6385c2000000b005b7c45c7b8fsi4077340pgd.664.2023.10.19.04.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 04:26:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iFvREIZt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id E25308090EBA; Thu, 19 Oct 2023 04:25:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345307AbjJSLZ3 (ORCPT + 25 others); Thu, 19 Oct 2023 07:25:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233097AbjJSLZ1 (ORCPT ); Thu, 19 Oct 2023 07:25:27 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA4C5112; Thu, 19 Oct 2023 04:25:25 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50389C433C7; Thu, 19 Oct 2023 11:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697714725; bh=2+1ko55W9laxkcWM8XgRn2t5ivATFYF/i+u9InS6YGg=; h=From:To:Cc:Subject:Date:From; b=iFvREIZttd4PBZP5wFQgW5etIhNOod1lbEpO6DboYsnmHopXPF+nkcYHeWu7lFIk+ 9Awcuzz9OUOD2zYmvbf5UhZAr38qduuWe/CGusXmhCPLjHLgylJjajGteVdG/0LKt2 BmjdUS/32FIfKQZFbbu/Xst0tGHXok7bZNidnvgNcFde6oYTZpnFNk2foNy2vPGwyq RfUPnMjI3Te7coftpneYAaFXFuRbouSldLU0Q36q0EjFjCJYlPrwr70Tq4Hpl/zeCx jf6ohOfVUtrgTHVTf8qHSGrxMRPqTUIO67yhyWT9pSduo8yWQokEpTLEQt7LnT2M9e sgVzSmYdHGn2Q== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtR9b-0000Xa-2E; Thu, 19 Oct 2023 13:25:28 +0200 From: Johan Hovold To: Kalle Valo Cc: Jeff Johnson , ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH] wifi: ath11k: fix htt pktlog locking Date: Thu, 19 Oct 2023 13:25:21 +0200 Message-ID: <20231019112521.2071-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 19 Oct 2023 04:25:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780182963585956447 X-GMAIL-MSGID: 1780182963585956447 The ath11k active pdevs are protected by RCU but the htt pktlog handling code calling ath11k_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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Cc: stable@vger.kernel.org # 5.6 Signed-off-by: Johan Hovold --- Here's one more... Johan drivers/net/wireless/ath/ath11k/dp_rx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 62bc98852f0f..0acbf53ae991 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -1621,14 +1621,18 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb) u8 pdev_id; pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, data->hdr); + + rcu_read_lock(); ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id); if (!ar) { ath11k_warn(ab, "invalid pdev id %d on htt pktlog\n", pdev_id); - return; + goto out; } trace_ath11k_htt_pktlog(ar, data->payload, hdr->size, ar->ab->pktlog_defs_checksum); +out: + rcu_read_unlock(); } static void ath11k_htt_backpressure_event_handler(struct ath11k_base *ab,