From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C3583CFF50 for ; Wed, 8 Jul 2026 19:59:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783540778; cv=none; b=iTV6H6CCcbrEpNsdv1cOrR2QrDVoQJl3emA1yVyjeV652nNPUHKRuf23Clu6b+ly1djCBBF/htu344NR8xZKx4i7Lj7JQfsIFX/hmzOvwhgx/1WbuhQgGr/Mb7Gp9skLPqHKdsbxawyN/X0XgHFIVK61BtFhP5cAlenw1XL/OpM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783540778; c=relaxed/simple; bh=DArdENvMvZauhzBuODBJvzWCeC7C/HSPdy/5V1YX23g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hqIyAENWZbS5THtEPnH1/QqnrMDvjB66GSyWSvhI25OTPQ49ZvMpUO5UvET8yc3YLCgioLIJsnZZFVqIa43ZMuKVboxUsSvF5mi+PLGfWbwBkN64rpPYoOBLmeekgIMtwg+pwepaq6/h9xhW3ZAhmeSelOsv/Wxr/B0zfJ9bUXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mKlvhDSr; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mKlvhDSr" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-3811074a8c5so984532a91.1 for ; Wed, 08 Jul 2026 12:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783540776; x=1784145576; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=K434/OKl2jqJkcKKF41UxdXI1B+RJY0uawUDIIMVgbk=; b=mKlvhDSrzW/azRWt3iDwP+6phjmVmCMzVuwlhWFsbeCV6zfQJoKozFMIaIqiQVzpUX 9fPXbdGbBhGUO5k6UTYu+PXOSGhCXGmINBrXoxcOBvLBeG94/3IW+mp51vt8yG6phkyj U3B7Jac3HbgrvFWUkohv5JGKR8nYxXDQ5mKhUH5JwO6+4bE8Cot+SvodpoqCav9s356j 59qnpuuPhNP7YsH2ifOaxdSjiLyhxTaByCWs0C4uRHWipVJu7/nkw7DjpkBK80qH+5ON 4O4IfkkBCV3q869VF8l276+QU+RDxdGwvu1YhhlbLFX1ktIWJZxrfBoK4Cqq5M6M6xUv qEdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783540776; x=1784145576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=K434/OKl2jqJkcKKF41UxdXI1B+RJY0uawUDIIMVgbk=; b=N9+rhvysJ98B4WdNTd0Z4vtHSTmpDvw55vm7b4AsmbxYJk/yrvIrPc9edzmFSXNTfH K7DltwpkUyUzWB0eLXYzr8968baAKyPBWg1KiVkQCgweRu0g/c2hfKU5IJOpikPOwUzH L6V+UgRcAeumRjItH0aVY5C/cnNIK0kDxjy1RrCf/GS8QAEgH+sKZfn943hlQMesN10n cEeEJkObXW6IyeXktBhzhMVbDh2NoJP9DRkwksXs+ypYt3Woct2WsPv1TfF0yVS6yK21 HowMhvN7i97vhTngNICM3j9yoGHHuQjbEqbhYK3myTa46kMbXmeV4TcslvxLGSUYt9JN krTw== X-Gm-Message-State: AOJu0YzTbhScneJdz3a+XyS2dgeuIj9vTbNp90zA3VRl1dS4v82Q8NQ+ Cb/yqmc/w/Egp0Y7BxSgYHjTgMQylI3KsDl9v/UfFKhJ6ZURDTcuvafY X-Gm-Gg: AfdE7cmPENsysQxWbX+HyweroIZPfdXJkPnO8lqYeh7XoL7vBax8RbN/3sl68/nJO3G P40001j+AXpUv0PmLwyymzt/a0V/HMF0sHsxGN51YIy5GrjHCzNfG8uAxRfNG16eBKhhsi4xhsR rqm/wTSnTLjkCNGjf2LLV/+y780pIMEdycbxI9Uoa62lA1ExSsO3Drp+5BpTdJjZTBD/FmjBUpp GXFYrTlNDvX/exWXShH+Ej9O8gLk23iEO9Elvd/uczsBlbpLFH+otM6bamhL9MtM6K7mmhRgvvT TXsXxAaGitchR4pApyi3gHAOxkcWNJeVjCy8NvVHiNXSjJVNiaKtMI4D0PW/aO0/ztMvsSj8JN9 4IjQ6N8i5b+uXC5tkJrlhPGrBMjfN2lBLIJqjkbM+E51U5zxtN23WNJc8/AMZ4EPoTrAtLZTAYF arY1bOb6tQ3LCO2C8Rc7TEBpAjpmNH6QKzFSQDwTiZSGlI9S75tyCG X-Received: by 2002:a05:6a20:12d0:b0:3b5:52b4:87a7 with SMTP id adf61e73a8af0-3c0bc8ac06bmr4890359637.6.1783540775513; Wed, 08 Jul 2026 12:59:35 -0700 (PDT) Received: from KRHW1CJW23.bytedance.net ([139.177.225.228]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31174a8f521sm22585395eec.22.2026.07.08.12.59.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Jul 2026 12:59:35 -0700 (PDT) From: Zhao Li To: linux-wireless@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Miri Korenblit , Brian Norris , Francesco Dolcini , Johannes Berg , Jaewan Kim , Daniel Gabay , Emmanuel Grumbach , Benjamin Berg , Anjaneyulu , Peddolla Harshavardhan Reddy , Lorenzo Bianconi , John Crispin , Avinash Patil , Cathy Luo , "John W. Linville" , Aloka Dixit , Zhao Li , stable@vger.kernel.org Subject: [PATCH 1/8] wifi: mac80211_hwsim: clear PMSR request state on abort Date: Thu, 9 Jul 2026 03:59:04 +0800 Message-ID: <20260708195911.84365-2-enderaoelyther@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260708195911.84365-1-enderaoelyther@gmail.com> References: <20260708195911.84365-1-enderaoelyther@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit mac80211_hwsim saves the in-flight cfg80211 PMSR request and its wdev in data->pmsr_request / data->pmsr_request_wdev when a measurement starts, and clears them only when it reports completion. mac80211_hwsim_abort_pmsr() never cleared that saved state. cfg80211 owns the request and frees it once the abort callback returns (cfg80211_pmsr_process_abort() calls rdev_abort_pmsr() then kfree(req)), so after an abort data->pmsr_request dangles. A later hwsim PMSR report then dereferences the freed request in hwsim_pmsr_report_nl() and completes it; a use-after-free. Clear data->pmsr_request and data->pmsr_request_wdev once the abort matches the active request. Move the wmediumd/virtio notification check below the clear so the saved state is dropped even when no notification is sent. Fixes: 5530c04c87c5 ("mac80211_hwsim: add PMSR request support via virtio") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5 Assisted-by: Claude:opus-4.8 Signed-off-by: Zhao Li --- drivers/net/wireless/virtual/mac80211_hwsim_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/virtual/mac80211_hwsim_main.c b/drivers/net/wireless/virtual/mac80211_hwsim_main.c index 956ff9b94526d..bc0818b525224 100644 --- a/drivers/net/wireless/virtual/mac80211_hwsim_main.c +++ b/drivers/net/wireless/virtual/mac80211_hwsim_main.c @@ -3841,9 +3841,6 @@ static void mac80211_hwsim_abort_pmsr(struct ieee80211_hw *hw, int err = 0; data = hw->priv; - _portid = READ_ONCE(data->wmediumd); - if (!_portid && !hwsim_virtio_enabled) - return; mutex_lock(&data->mutex); @@ -3852,6 +3849,13 @@ static void mac80211_hwsim_abort_pmsr(struct ieee80211_hw *hw, goto out; } + data->pmsr_request = NULL; + data->pmsr_request_wdev = NULL; + + _portid = READ_ONCE(data->wmediumd); + if (!_portid && !hwsim_virtio_enabled) + goto out; + skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL); if (!skb) { err = -ENOMEM; -- 2.50.1 (Apple Git-155)