From patchwork Thu Oct 19 10:42:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 155433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp290857vqb; Thu, 19 Oct 2023 03:43:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVtXnhTWbC0e0wTG/YqEYbQ7d8irUgmNpmmqhCrE59XoqAvMDNMbxmRrlleBdqVgIynk9q X-Received: by 2002:a17:902:8502:b0:1c9:bf02:6638 with SMTP id bj2-20020a170902850200b001c9bf026638mr1645761plb.51.1697712200551; Thu, 19 Oct 2023 03:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697712200; cv=none; d=google.com; s=arc-20160816; b=LK2s1i2+1+SgimGsLqFTTyyBd1SWhMtWW07Xw7eHrAVWVQJElDxxVoLlmFn+FxpU1Z /FULIGZWn2a1stuILUaEvpUy9rqOldKy4qa0xbxdKAgZX8aBTrIFxCYfEVzsoAv4trWC QyRzhkaqgZuDXNvWpGg/bl1qRBYGlRYkkU/ktr2mRwvUkXsTBr1e3HkalUe2B2UaFH76 SFMKGiyAX2mPvgEmR9mbvG5wQgFiwzuTAUb3aoPM1+XWT0Kob5SNUndocQiFk/RNn4HB padxcxOhWYxPcTWVXez+00ko42JnxaYIxpOLQk6Ei9D01pT7km7zpLDg3dkZQsnaWvdg B2Sg== 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=b971VsWn/KQVGPuiWHjRuHex1iSMeMX+MGedsW3uMTA=; fh=g2eagvQVT0rBo5T85aspub4Qs99bFvN0wPRxwEE5OxY=; b=OxMxfcHFFMZHTjnQ7pj/KT1LBGCd8R3w7gUrcWK7lQ+Of7DaiIBVH03/STYdu6CZjO siItE5PRzQIDWrUb/qZu/x/gztiNFjUsD9ZCfHxdtmqiD2QQNEQs338rpbLtCm6Rh+hZ uereYNNpx5pZIG3xogJmanibWgGU2vJ6/Mjj3RFfX7jRENdWLRYc2MMKm+ruoqEqYk93 JxvBYhrr1ZJuQWpISXFO31fup49GHuqk7sTKBYHTGzS66d+JuDdgbUdXyVyJhYlB+uX+ 61hQBHCi9soRVtqNEL+H9x+Yxb8N20AaFVd+e2EnLQlbrPh8QIxlCmHXzoWFjQatdg7y kaFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DAecKhu+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 12-20020a170902c10c00b001c62e42ad8bsi80356pli.72.2023.10.19.03.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 03:43:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DAecKhu+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id DE436822CC70; Thu, 19 Oct 2023 03:43:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345002AbjJSKnR (ORCPT + 24 others); Thu, 19 Oct 2023 06:43:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232626AbjJSKnL (ORCPT ); Thu, 19 Oct 2023 06:43:11 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04CF5121; Thu, 19 Oct 2023 03:43:10 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 884ACC433C8; Thu, 19 Oct 2023 10:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697712189; bh=bGk+4LmRzRI6lwAbSKEMT39TnxGgAAFFjrhmhW3xrro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DAecKhu+hG817Li21uY8l32nbJ1oD/JPcV29vaPD/plORVB9Upv0fIAlo5jn2ghRQ 7kRtp2FseT4nHnjRjftXJm7f/g3TH1pXZB2pqVhk7H59Kp9oIXcMvUtuehqU9oZ/hQ IDXrzH0gwEIQT+LzQ17XqBJR2RmwI0JHm9plclmyIOXg4aQzV/Lkp3VRGSBPLbGKV7 +7jfs0qsHX8Sx1C2Pt7wv9Ed9df2Pbx4APa9MKgNCrz690jGv1I+8QNcQCiNmJg3Dv L6mwxvRs0FTPH3+QYJ/NbA8/jL1ix/cVw/+BjGL3MFG0CLE1nrKI52ziXmgmz0LMJ8 KRAMhHg6HwkMQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtQUi-0003am-2F; Thu, 19 Oct 2023 12:43:12 +0200 From: Johan Hovold To: Kalle Valo Cc: Jeff Johnson , Pradeep Kumar Chitrapu , ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/2] wifi: ath11k: fix temperature event locking Date: Thu, 19 Oct 2023 12:42:10 +0200 Message-ID: <20231019104211.13769-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019104211.13769-1-johan+linaro@kernel.org> References: <20231019104211.13769-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Thu, 19 Oct 2023 03:43:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780180268239983683 X-GMAIL-MSGID: 1780180268239983683 The ath11k active pdevs are protected by RCU but the temperature event handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a read-side critical section as reported by RCU lockdep: ============================= WARNING: suspicious RCU usage 6.6.0-rc6 #7 Not tainted ----------------------------- drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 no locks held by swapper/0/0. ... Call trace: ... lockdep_rcu_suspicious+0x16c/0x22c ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] Mark the code in question as an RCU read-side critical section to avoid any potential use-after-free issues. Fixes: a41d10348b01 ("ath11k: add thermal sensor device support") Cc: stable@vger.kernel.org # 5.7 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 23ad6825e5be..980ff588325d 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8383,6 +8383,8 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n", ev->temp, ev->pdev_id); + rcu_read_lock(); + ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); if (!ar) { ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id); @@ -8392,6 +8394,8 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, ath11k_thermal_event_temperature(ar, ev->temp); + rcu_read_unlock(); + kfree(tb); } From patchwork Thu Oct 19 10:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 155434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp290997vqb; Thu, 19 Oct 2023 03:43:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFikRdxYc/h89Mp5mBHl8UZKKofeNvfrKc8VCRxpfCmqVUUfiQmlWQizWaCgemwH7GqsbdS X-Received: by 2002:a05:6a20:1604:b0:172:6771:d766 with SMTP id l4-20020a056a20160400b001726771d766mr1714037pzj.51.1697712224316; Thu, 19 Oct 2023 03:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697712224; cv=none; d=google.com; s=arc-20160816; b=ZApNbs6qMRzHnhU7MicBun09YD7/N50RW6hia0Af4t8469vZH0HBC1sHLln+TWnPv4 8IT0gSLX5FKEdtKplrAjEyM/it9m/b2OlRUca16scKjPa7bHbAt/m87RCE+KJT5pkx0R vxDaCncS7W8imVzyOWBr7pN5o3M0b+dy8v9jCgRmc/jUhorIuO/egtEEbbX1Jp/fKTN/ QhKsWYuoyP3/kzTjI8B5SsqmuRWfy7T/sVwOI3OnEpQyCq3rlHfYu7z0R6Yj66KaJ9i+ 4YdFSpyKOfxr+r/3u/eFH5qrHiyF1baNvWudFCj+PZPM3rX4PRzXLb+VhXj7n/FXCiBE qfxA== 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=C+ouhaKdaZ6PJn9J2UlfcJ64xOVqUNl2+jIniuA4iZA=; fh=g2eagvQVT0rBo5T85aspub4Qs99bFvN0wPRxwEE5OxY=; b=YzWrme2AVjFWw5vjHV6xgW1DVOZXNQGDa0lpK/ya7zxP94oirLIhkauQk0OVWYUiEc PzXT+TsF1lP70EpmpOmtQ640RqrHFldCJwYDiWWPQZwMSHoImUVQZr1fh5yPce7MneAz kFE+64S/iyvKOpIxGrJ/R7lhCP9M3b3LalQuKjZ0/QphYjnszmxrfZ08h1xFFcw9tBAj hv7bgTQsPSUx9FpaWUN2KODQF0koAQnLJdhKH4AMX1BHhVWngpNsqpIrKB3uVab7aoH3 2b0mCNfSDu9qrzitmENK90VVfI+NpxzKuLkckhsPgVWvZW+ngvBzmXk9jtp5fTgT1KS7 vFIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kz3CVkty; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id m12-20020a170902db0c00b001bbd639dff9si2078301plx.467.2023.10.19.03.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 03:43:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kz3CVkty; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 436ED824E7BE; Thu, 19 Oct 2023 03:43:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344730AbjJSKnP (ORCPT + 24 others); Thu, 19 Oct 2023 06:43:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230297AbjJSKnL (ORCPT ); Thu, 19 Oct 2023 06:43:11 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03EE5119; Thu, 19 Oct 2023 03:43:10 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A9BEC433CA; Thu, 19 Oct 2023 10:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697712189; bh=+65hIKor49TrWPpX1MZLxHjHl0a9EdHwn7yekofvZVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kz3CVktyrqbK/5jucRIqPe4Bg8/2aUDx5aCC5oLs93UOJ5tvN73wKlRdWq5NTtP+W Mc/TknTyh1iGgz1UoQOadGAH77q/0zr3L/5nkjnJtDc+TUTjMLONonwsLMMLi6/Pew 3Hwej3Jtows5gPsRuMU8pPa6+PjI7jxF7eVJ7dgWctg0OqH626yg0pGxs/mE26M9db YX16xbHr8mJY4dsZzDyBYrnUHJXh3pWb/3FbYzuzp/f1/2DMdPtAgJhkyHsBhuSfZb MLmLetIvMB22OLHJZdUvpmCg7XGbuTQ0WektV7RzW8qKEaH8S6nGaT9Zw+wF5tuqb1 /yYqoFvMDy3gw== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtQUi-0003ao-2U; Thu, 19 Oct 2023 12:43:12 +0200 From: Johan Hovold To: Kalle Valo Cc: Jeff Johnson , Pradeep Kumar Chitrapu , ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/2] wifi: ath11k: fix dfs radar event locking Date: Thu, 19 Oct 2023 12:42:11 +0200 Message-ID: <20231019104211.13769-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019104211.13769-1-johan+linaro@kernel.org> References: <20231019104211.13769-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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 19 Oct 2023 03:43:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780180293312986947 X-GMAIL-MSGID: 1780180293312986947 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 Signed-off-by: Johan Hovold Acked-by: Jeff Johnson --- 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 980ff588325d..fe6b70a503d0 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); }