From nobody Mon Jun 8 18:55:55 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 5AE0B410D15 for ; Wed, 27 May 2026 13:34:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779888845; cv=none; b=id6WSWDN3QFf5vW83F15HVcD98xX1wfurU8zNXHVlHJ53Vclrw/B1MgUMQCeKohFzvgPloiVBLaKLs4VUP2E9VfaJtacfhEOs37VJSiOwSslwIxgVhcL6pKsuD01nt/2zcc+m/klLgoybh9GPYTSF7CngaRcjZjCkt2dWy/B/uA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779888845; c=relaxed/simple; bh=kJg3+vkC/Ksj70rm3U6aG5YJmh840dLCu0pSDSlzRp4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=oxeq0RkelTtyxGJhQ2EGJP3DHN1Vw2K1cd4LBhb8NVlOImVa0eB4L+Zha08osha4iJij8FHX7lw7IGnPH8ldcuLbLdzZNSWb7dtI3t8m9OQckdWr2B1E+xLxrIfbv1p3yng4GGEUCDrC8rcNlwFJAAqnQ/IeYbetCmqAyzP51OQ= 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=MqgTVytt; arc=none smtp.client-ip=209.85.214.173 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="MqgTVytt" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2b941cd869cso75984705ad.1 for ; Wed, 27 May 2026 06:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779888844; x=1780493644; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nbFhjouUY/ThE/xIFttbuPkaPlFmLqofLr8oFQGobyg=; b=MqgTVyttUgIDr2xKAwZB5dt4x4xbu46UEPJtCDOogBJXtu5fXCBFtnjpYbtQ0c4+gZ Cw2/4rQoIW6hAE1XWUvyk0iNRrvF4SNN63ch3t9FB/Koe+PTL4vzGw7m6DcPrxPtqXXn kbGyWFFlwReU91kzrbnolDImOj+7dFOWCkWDye9N3xoc1Lg/LPqnObhpcwjYimEjKrNr CvmTQ7lboQRili9EOVhQbJbDtyIHCHmUUKrs468cXjmVewK3ZuxTrdR1j5isRbgj/NVq N8CwiymlT8tX68q4oCX3lM92oNcJ6ZfIyQStcnVN4f2rLSS4kGk488/mjef5OAR6NeUi 5pKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779888844; x=1780493644; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nbFhjouUY/ThE/xIFttbuPkaPlFmLqofLr8oFQGobyg=; b=A06LEp8CqWnxlx6GLIrHoqJbcTxIejCWn44D8Vni8L76T3HXo+j0SOtsN+xq6IxQIb 7AZGIVp+ms6t9ubxc28Oy3BzE3/UzzZgQ4W7KD1z1j4Lb7GVkUgsdJ1Fsh0wcaOUSV+I C6IYLj/nZvbAqeQwQhy4JMjPoP7lWvBUZAzK0zsITM1DFA7OTYH8OMCsuYnnqQLJRP57 qdZTRxqmqKai81hl1xDaM5+Tm8n4k3ujMfiv9ubVjyls7PvX5vKyrVqZ2yMqNANqNd8n QI95956Jmxzgfh7VwFdHAOwBPgSU7jMOlfFq0952AonyfGJM3dPJTnBnpulkKnbGfzek 9vow== X-Forwarded-Encrypted: i=1; AFNElJ/54ZhGMJpqi7HZi9vYVRNrfwz7y3SD+DsDIVcfUXzZbvguUrm3V7D6kT8Km2ZWiKbYY3PhdShQogcN7lA=@vger.kernel.org X-Gm-Message-State: AOJu0YxdKT8oYuxSv6EvKFwKvkvumFfSAd12W8dOvqhBfS+Ki0XONZgW NzSCeN+cEyzmsUPf6TOykQf6f5PfVIjzkyNffnkVSY9MY2pxGperFDHM X-Gm-Gg: Acq92OHcmjUgdkuWQCce+PxvPkn8XtWSEgrmCLz20GDhUQIpbkwBhZxz8km3vv8YQ2k 1mcvzFu/jZvZMcPioVI1r4NePm2/Q7DZkK8alyaksVNyrh5J+6z5vuCP6IEh75Zpp8nrtV6hWoo +8hUPqDI21HTB69JANHq8dNE4EqbSPRoWaC+4UDXw+vZjP+j7G598BJeghpux0ohvT3LR3j+0lL epct4I5GOegdczQduEK2YkHI72Ncr8z/EyGHUzIfaHahH8fYQEwyi1Amc/Em6s1N0ciWna30waQ yNUejytJUXCHBAe40v0k166xAf1Xn1FABS+RA+q/Uy56LOR20ECRD0qoPvE1Szh8gBvjmgTG4m1 uTogwItBodBoNvoWR9OWXeCLKQ8vj2XsXWgjqO+y+JdBnVQusjWOX2h5Qwdtfgr/XpGmWMgqlkl ICefbFvvUJ63LWE4CJdb3rhQXLGxsBWv8lsDYwKPSJBLjCM3gu X-Received: by 2002:a17:903:15cf:b0:2bd:9c0a:32c with SMTP id d9443c01a7336-2beb0674468mr243336965ad.19.1779888843558; Wed, 27 May 2026 06:34:03 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb58b2cd6sm160008365ad.52.2026.05.27.06.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 06:34:03 -0700 (PDT) From: Maoyi Xie To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Maoyi Xie Subject: [PATCH wireless-next] wifi: nl80211: re-check wiphy netns in testmode and vendor dump continuations Date: Wed, 27 May 2026 21:33:58 +0800 Message-Id: <20260527133358.2853238-1-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 79240f3f6d76 ("wifi: nl80211: re-check wiphy netns in nl80211_prepare_wdev_dump() continuation") fixed one dumpit path that looked the wiphy up by index on a later call without confirming it was still in the caller's netns. Two more dumpit paths have the same gap. nl80211_testmode_dump() and nl80211_prepare_vendor_dump() both keep the wiphy index in cb->args[] and look it up again on later calls, through cfg80211_rdev_by_wiphy_idx() and wiphy_idx_to_wiphy(). The first call binds to the caller's netns. A later call does not check it again. In between, the wiphy can move to another netns via NL80211_CMD_SET_WIPHY_NETNS. Add the same net_eq() check to both. On a mismatch, return -ENODEV and the dump ends. No mainline driver registers .testmode_dump or wiphy_vendor_command.dumpit, so these paths are not reachable today. Drivers outside the tree can register either. Signed-off-by: Maoyi Xie --- net/wireless/nl80211.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index f334cdef8958..d462e0b784ad 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -13420,6 +13420,16 @@ static int nl80211_testmode_dump(struct sk_buff *s= kb, err =3D -ENOENT; goto out_err; } + + /* + * The wiphy may have moved netns between dumpit + * invocations (via NL80211_CMD_SET_WIPHY_NETNS), so + * re-check that it still matches the caller's netns. + */ + if (!net_eq(wiphy_net(&rdev->wiphy), sock_net(skb->sk))) { + err =3D -ENODEV; + goto out_err; + } } else { attrbuf =3D kzalloc_objs(*attrbuf, NUM_NL80211_ATTR); if (!attrbuf) { @@ -17382,6 +17392,15 @@ static int nl80211_prepare_vendor_dump(struct sk_b= uff *skb, =20 if (!wiphy) return -ENODEV; + + /* + * The wiphy may have moved netns between dumpit + * invocations (via NL80211_CMD_SET_WIPHY_NETNS), so + * re-check that it still matches the caller's netns. + */ + if (!net_eq(wiphy_net(wiphy), sock_net(skb->sk))) + return -ENODEV; + *rdev =3D wiphy_to_rdev(wiphy); *wdev =3D NULL; =20 --=20 2.34.1