From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 7F2EF391E59 for ; Fri, 12 Jun 2026 13:37:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781271424; cv=none; b=opH6gHgKs9ltbMWwHpvFTnK1Pf+LXX1vsCESEfkB8N66XovlnNPR3QAQzGZYSwVvBYq36aL/3ELZ3uHpsXNFSp/V8e5dDceKmPaX68SL5ESZ/D1eLE5sYpRf63bp0ps4zWnSZo5fSb2mkGg4f/5gVKmnOQ+4tuvG8s68hg09iPw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781271424; c=relaxed/simple; bh=2KWpkPQa41bZlQsm6JluDJgkZzmr13UUr59IacwjTO0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=H/gdmK8ixd6I2IaWG0KsgsyIVNfHYeSjBymEZotZV90RFC5ZxUgZ2rqfKjzrztZg7jHclX9exNOdQIdtBVwpmqPKnw+5mpkRhj1BiD1QiM2sQ/FAa7VIlo9nBl38LguVZI3nMkNSH7f0X8Dtvrp/C8HxWM1rApfOVDNtWnNKSfQ= 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=gG6rxkAh; arc=none smtp.client-ip=209.85.210.177 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="gG6rxkAh" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-8422f395a4aso722212b3a.0 for ; Fri, 12 Jun 2026 06:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781271423; x=1781876223; 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=OtjgRP64pOcIgAiCaPMHfLRKQkkQ9g99va4bg4X2WuI=; b=gG6rxkAhBo8NS58cYQ1q1y5l2jGqyYfEFy9NBCJnkffIFV0Lof1Tt+eM65o3J/VYbg mQU3C4dGd8ljvzlhKkBNkN2+Cj0PbvLypmsLikzEXxwecf1ItsjzQQVwC3+4VB3oQMDm TVjVAS7n8zXhTYwZeMYkZQGvAgEJ4KtLjnQwTIXnyWD1laH6FbHyVaHb1IXffE7XbRS/ p5PuEWYmtLJ3Fhws0ThVo4je4WfpImZBSZ+2T1tiuWIjmzbnu/8lInP3LidiMKNhywsP fgcUxOfrOwuaCgHb0vlzIwdv0mAG/Ifrl3iaWfk4gDTtBR5vmjGYNqgGFrHdB+8toyzO Ovag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781271423; x=1781876223; 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=OtjgRP64pOcIgAiCaPMHfLRKQkkQ9g99va4bg4X2WuI=; b=r8Bpve6rpEDrXpc0YYm4QWBpwMMWF1QIZDliSq5P+2bEPcLx/7M75zDmCN/kBZKYNG I7+ZNt0qTM38PBPRwzb5GN5HESWi3R1/TBfBh8zqG1jeQPZZpalLPWiSroDJx41ztGdw mgX/rZ8HLgMpWU5T38KKyBbukeQW+plgqLFxaGxLH8oEdIJ3AO4AJDjd18BHGGkrdKjP SjH+/xaXgqIoAFIA3wV7Svog83ompHFm+kSsATDbvIGIk4/nioch1NQS7pbzelfAAGJQ NTiDaEyDtYBozKmaeLJqZaxR1jzwEYueU+nbb7czgotwGKHp0pw3AyNYmWopKmcwVuvt BYkw== X-Forwarded-Encrypted: i=1; AFNElJ9O6ajS2Zj46Db93NZ+bBbCsb+t35Pr+0kSY2XckFq6ir3y68/O3RdyHfhcYV9+KZA13gVA18Sx00kvdS8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/H6VCaFrwRSyu68uCJ0iIYGm20TofCy6EFsT9Xgzd6sl0wGHW l6OueodCNDmk4Awu/4quNecf/Zfr/rh8cNDDI4ONxerfDqsSKMefLoWdYHLzvhuq2d2vSw== X-Gm-Gg: Acq92OGCjFYK9yJunCO1RCBldSpNkJ72xQX8rPUuEXUoJuCbAC3lcP4QdyO2D/xaSYv 2UKt/JorBMusDxgBSO76tY8m4tGmiwitmmjugd5cO5dYkQh7H3+ejbUQhsAVSw2a69oAA0pstoz tKcZ7XEOEcb+RK3DhmxwnL5krYw3jAqx5Bb8Op0yLzVPGbbTAIyqUsRDmFjV7edIU0v0N0icZWT fxvC3/6BbJsJbbVooZcNHSJ4Zw1or9zqa9pNCzwj8o+V4iAoxI/LXaXYNARHErspK2EZl7NsLdt 2toAll8FtBdFaJbUglBaKcgMAKb7nA7+4SptZLwSAAAAl1uvXZ4A8Kx+Tlaq0TPB/NGWQhoYZTL efWo9pIIpq4YYs7SQ+VKi+TA9yGy1pOAFzoccvbW9uBhl92/bKmmRTOBY6cN37A8boP1o8jj/PR HD9cKelLDXHKGLsawh3hp63xFv0Z5u1Nxl0fGK70WZjH6ZLcXbiNxgex2JOlArM0M= X-Received: by 2002:a05:6a00:451c:b0:842:614b:50dc with SMTP id d2e1a72fcca58-8434958ae59mr2904990b3a.13.1781271422827; Fri, 12 Jun 2026 06:37:02 -0700 (PDT) Received: from KRHW1CJW23.bytedance.net ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ac9bfe1sm2574272b3a.12.2026.06.12.06.37.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 12 Jun 2026 06:37:02 -0700 (PDT) From: Zhao Li To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wifi: cfg80211: validate PMSR measurement type data Date: Fri, 12 Jun 2026 21:36:57 +0800 Message-ID: <20260612133656.92900-2-enderaoelyther@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit PMSR request parsing accepts missing or duplicated measurement type entries in NL80211_PMSR_REQ_ATTR_DATA. Track whether one measurement type was already provided, reject a second one immediately, and return an error if the request data block contains no measurement type at all. Fixes: 9bb7e0f24e7e7 ("cfg80211: add peer measurement with FTM initiator API") Assisted-by: Codex:gpt-5.5 Assisted-by: Claude:claude-opus-4.8 Signed-off-by: Zhao Li --- net/wireless/pmsr.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/net/wireless/pmsr.c b/net/wireless/pmsr.c index d6cd0de64d1f8..b1ead4adf9690 100644 --- a/net/wireless/pmsr.c +++ b/net/wireless/pmsr.c @@ -213,6 +213,7 @@ static int pmsr_parse_peer(struct cfg80211_registered_device *rdev, struct nlattr *tb[NL80211_PMSR_PEER_ATTR_MAX + 1]; struct nlattr *req[NL80211_PMSR_REQ_ATTR_MAX + 1]; struct nlattr *treq; + bool have_measurement_type = false; int err, rem; /* no validation needed - was already done via nested policy */ @@ -265,6 +266,14 @@ static int pmsr_parse_peer(struct cfg80211_registered_device *rdev, } nla_for_each_nested(treq, req[NL80211_PMSR_REQ_ATTR_DATA], rem) { + if (have_measurement_type) { + NL_SET_ERR_MSG_ATTR(info->extack, treq, + "multiple measurement types in request data"); + return -EINVAL; + } + + have_measurement_type = true; + switch (nla_type(treq)) { case NL80211_PMSR_TYPE_FTM: err = pmsr_parse_ftm(rdev, treq, out, info); @@ -274,10 +283,16 @@ static int pmsr_parse_peer(struct cfg80211_registered_device *rdev, "unsupported measurement type"); err = -EINVAL; } + if (err) + return err; } - if (err) - return err; + if (!have_measurement_type) { + NL_SET_ERR_MSG_ATTR(info->extack, + req[NL80211_PMSR_REQ_ATTR_DATA], + "missing measurement type in request data"); + return -EINVAL; + } return 0; } -- 2.50.1 (Apple Git-155)