From patchwork Thu Oct 19 15:53:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 155641 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp483202vqb; Thu, 19 Oct 2023 08:54:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGw+ok1mwJj27KP5WflpHPYkq3FnYfptXWZ+lTCxvivAN4qjkNrldIgBZzzOIfS6wJBXZMJ X-Received: by 2002:a05:6a20:938a:b0:15d:1646:285a with SMTP id x10-20020a056a20938a00b0015d1646285amr3558993pzh.21.1697730853090; Thu, 19 Oct 2023 08:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697730853; cv=none; d=google.com; s=arc-20160816; b=HHw14f80UhRu0iMpi3c1v+X5TpgI0TASE8zkrYN5ZKTNfynOAldN97BlsA6mXvGAqq 7A4rW8RV8tf8Be1UlD5jMc/XZLpoTuNUPoqTDp+ik/+KN8pf6lh4A8+eyKLwTk2/lM+K Ggn3sfsNsbxuwLI/j1QJIjnDkWTgRUpa+f4SMinlOIKnUkI7Iy2zrQLNVoI6Zlwz6/lc rWqmqyCPn0kI3rFbGBuMn5pQE2vgpx6lzxH6oMPgZellIzp4WR/FWOZDctX9xRwPgClO lHfWoLdEH/zNK18dnUgnaptYYsUqqHDfHVWzyfAdDg9don9ebGsExUZe9dLIuCS1+r3R sIGQ== 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=ufJ/aJNUlocfbpytwu1oFaTsNqP9MW6INhAHA80S3AE=; fh=kUn9h0HqmQF0pAmbCBEs17yQfTzFCCf/iTypTJqm3j8=; b=I4VmL6NlxYNqSZy9Ul7TIS7Ml2BwJZJFz8pjH2/vALWvsfXcZ9m6mNdKqWwSECcr4N 8dkWlRy7cNGBd6xipESKeOQe2fddoubLAg5307xlXJf1BknJYKAsbfOvLr8pb7ExRfWY RPNElV9KQ2tpKBA72Gu/Ob6hGzPGNEZPusaAjbVG7wVPB+RKeb4pCA5ELXdmUbN3Qkpx Nb/jOOzHt4lTvdFKtSgeE5fpz7lK5vPMa8RmAxtjHHJHg+McLEjMGazsxKu+VEmMQksz 7aFTfi/iFxLS1tVcn6MVczjym+1i5ObCUwqU+oyui21fMYplTMyepo9t/jDegbIHVez+ 2e5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sXKWpTyl; 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 bq15-20020a056a02044f00b00565eccbc52fsi5765750pgb.303.2023.10.19.08.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 08:54:13 -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=sXKWpTyl; 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 B733F82A854A; Thu, 19 Oct 2023 08:54:10 -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 S235435AbjJSPx7 (ORCPT + 26 others); Thu, 19 Oct 2023 11:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233176AbjJSPx6 (ORCPT ); Thu, 19 Oct 2023 11:53:58 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35E9C93; Thu, 19 Oct 2023 08:53:57 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1B09C433C8; Thu, 19 Oct 2023 15:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697730836; bh=wa4WXUdBJDSprT0pug2ujhG4LLF9gr+xArqonoxADzw=; h=From:To:Cc:Subject:Date:From; b=sXKWpTylvlESxh+A9Ob0R/6Ik+gMuidD6esDgwByGAV8s6TPXDJolqJ8+l+mEAHYh d1M59feYyobvivShElD7sHFA1952PL4IhTuygo2gVnCTiM2/+aOmL/VMxuVNXQlC4B Pkvr7U9z4QIB8r2Jy2rKHXVbYa09DwZn3Xd8/Aeg4Ou4eBbaFlpGA3Be3uOG7gU4aZ WtR6mxZnlEKNWalKmfIDIYPn/XQKlFxyTwnjR2f24gw0BqI3BQbR4AIdNxYFE0gNg4 RyNzKWp8mWJSCHYMNKmjQcGRBOQ8FnAi+LDtskbRn2XKQ/Ygc/VHfWOZL9VNFS+mPd ljpK+AzNp49rg== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qtVLT-0008Eg-2K; Thu, 19 Oct 2023 17:53:59 +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, Carl Huang Subject: [PATCH] wifi: ath11k: fix gtk offload status event locking Date: Thu, 19 Oct 2023 17:53:42 +0200 Message-ID: <20231019155342.31631-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 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 08:54:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780199826967941114 X-GMAIL-MSGID: 1780199826967941114 The ath11k active pdevs are protected by RCU but the gtk offload status event handling code calling ath11k_mac_get_arvif_by_vdev_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: a16d9b50cfba ("ath11k: support GTK rekey offload") Cc: stable@vger.kernel.org # 5.18 Cc: Carl Huang Signed-off-by: Johan Hovold Acked-by: Jeff Johnson --- ...and here's one more, this time using the ath11k_mac_get_arvif_by_vdev_id() helper. Johan drivers/net/wireless/ath/ath11k/wmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index f0eac6cb84fd..78af659b1ccd 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8618,12 +8618,13 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab, return; } + rcu_read_lock(); + arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id); if (!arvif) { ath11k_warn(ab, "failed to get arvif for vdev_id:%d\n", ev->vdev_id); - kfree(tb); - return; + goto exit; } ath11k_dbg(ab, ATH11K_DBG_WMI, "event gtk offload refresh_cnt %d\n", @@ -8640,6 +8641,8 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab, ieee80211_gtk_rekey_notify(arvif->vif, arvif->bssid, (void *)&replay_ctr_be, GFP_ATOMIC); +exit: + rcu_read_unlock(); kfree(tb); }