From patchwork Thu Oct 19 15:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 155633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp469706vqb; Thu, 19 Oct 2023 08:33:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgbrELTi/x33qXhQcF7HZK5dRjNlhY4iqbsyfUqqs9RfYQe67NPn3lezJxwR1ZgMRE07TN X-Received: by 2002:a05:6a00:23c9:b0:693:3cac:7897 with SMTP id g9-20020a056a0023c900b006933cac7897mr2789546pfc.9.1697729586309; Thu, 19 Oct 2023 08:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697729586; cv=none; d=google.com; s=arc-20160816; b=HXvjikbgDylS4ozO/QVMsC7yqSJoD7U8c+hRTv3BITJsJ9Lu9iT0sbSfmOueNXkL9K 1ymxprC3rjtgxuKojouxsyUdH8RuhmO9G/06FNCaoS4zw0MDvgOwfDz8osB6LapNemO7 0AxTzduASzDLgSnH2oSq3DpIZZGQYEyo9OHjJQy7xK3Oob2EnHMuFEMnAK+uU4e6GVi2 NMgDM9zIvImxm2OJkPrUHX4JrG4IhkgZtvZEpp/LcVr6YqiU9gD6jrJGXmYDVrVv6Gvs hmi8w6IIMZZiS/xijNtkwGr/2hJ/iBLyLXdyWtUsiZUD6jWmJuUCY0eA9iGT1GSxHtBE +A6A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FhZ4Z75mCIeHkcTMQZzKJW1u19UywH2LlJgOT/Wh2jE=; fh=wVjIh4Ry7X7gqxD7x4+f60lKPnJwP7xEuzok5FQ1a8Q=; b=TmCEnDLkMDQNpao74kXr0buIL58LCRZ1wQEOLnj2cWwTRTA8X0JMOO8wZ+i1XXCMZG PFrSRImD+wxkAyvvXc30hmmR/gOYvOfrxhPD5YlC/o99tbabYwgxrlSZ6A3bUdWr7Nh5 80MRcufU2stKZIwICvuPKoTrFg9XDJmtsVztTeoWiRBHVm/OUrwyG2slx76jQ7W+YmJ9 ajlznzjxNWVGZkm+SnDhshiZpp/d1NvjKnBtCZZhDy4NPUhUHXCFnI/lKCBe1HSIB2i3 43ClBBIoMQAo3DGwcRGUwkoHnOH3w1yaThWBpaBXOWqIaCUFOz+M8RVe7ykVgoc2yk5q cPhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=POBMJg19; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id v191-20020a6389c8000000b005aa0af5b62esi4451990pgd.511.2023.10.19.08.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 08:33:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=POBMJg19; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 798488325EB0; Thu, 19 Oct 2023 08:33:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346271AbjJSPc7 (ORCPT + 26 others); Thu, 19 Oct 2023 11:32:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345747AbjJSPc6 (ORCPT ); Thu, 19 Oct 2023 11:32:58 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD24312F; Thu, 19 Oct 2023 08:32:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6655CC433C8; Thu, 19 Oct 2023 15:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697729576; bh=JmxVPCdruKLMQZ5RUKgTCknlS6N8U4MPq35+pkolZUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=POBMJg19qSQ8erDJJsBUAf4QYH8J8D1C98PNUaEeDBax10sfUqooXE+3ZKs22bFFx Tg9fXsoNI6LSy/j0et+lzIy5ceQrs4BsPjQwjk6tD+nHsf2hGul/MyaheRNwH/wszt xHYnJlyz6oQmakAfMzDckwV0XWI316CcWj3YbngQAeHnep2LSdzgNys2eLGFEu5KNM HddIU7Bp2dEJECPMzwA191ONt1VSdxObTlvZ+T1OKmQWSXiA7A6TOvMFzR4bwLKq8l or2NE7fzpEJnHxWyFEMg+AOLSbqyFlZjJejvqN1n0klNmtRYMy+tSULs0BB/IKbE4I Zwz+s+1Czk0Aw== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtV1A-0006tC-0o; Thu, 19 Oct 2023 17:33:00 +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 v2 2/2] wifi: ath11k: fix dfs radar event locking Date: Thu, 19 Oct 2023 17:31:15 +0200 Message-ID: <20231019153115.26401-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019153115.26401-1-johan+linaro@kernel.org> References: <20231019153115.26401-1-johan+linaro@kernel.org> 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Thu, 19 Oct 2023 08:33:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780198498708035873 X-GMAIL-MSGID: 1780198498708035873 The ath11k active pdevs are protected by RCU but the DFS radar event 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 Acked-by: Jeff Johnson Signed-off-by: Johan Hovold --- drivers/net/wireless/ath/ath11k/wmi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index da1582b8dc30..f0eac6cb84fd 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8337,6 +8337,8 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_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 = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); if (!ar) { @@ -8354,6 +8356,8 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff ieee80211_radar_detected(ar->hw); exit: + rcu_read_unlock(); + kfree(tb); }