From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 10C1A3E5A22 for ; Fri, 12 Jun 2026 13:37:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781271440; cv=none; b=imgVRDnzauWN9LQxYJVS+qhP3Taqou1QAVGTjQoRCrq49vfy8kRucrVCbZxZhUoEZSEgigG7faycS/Jy9gSgct5ky+ML0bgAp11N5qwudNw/qUlSOHlBnsgSn0y8VOdP0+jn10TbXsGaO1ZzpcczYKDt1UN5w+SbqEJzMmElR44= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781271440; c=relaxed/simple; bh=eS2PCW1fBT7VZCc8gelLAF5XoflKDJFIK3buogIJH9E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=h7pFOBzx05mr0rdPcB11FWy645FI1g3HO+mqXMBiCDoD+yy8ZR3jSfHaku7eFH0NLzeqT10BnHqdiRGQN68KNLEwrGO3yKDHLObBEp9Mrk0gZEcj3KUn+QKcntkllSzQ6VNy+yXguEbvE+2qRPiIIr+U0x8C0CEy05Y/wznruZs= 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=TYt4v/+z; arc=none smtp.client-ip=209.85.210.182 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="TYt4v/+z" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-84226d0f1d2so716025b3a.1 for ; Fri, 12 Jun 2026 06:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781271437; x=1781876237; 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=KgAVEoo78tlaYfkuOLNp5/i9qrACsjmRKbV+G3pQtWs=; b=TYt4v/+z/Aw7wojmLvLg6hkCklZwZ7WjwUARXWj0VBh540LIEU0ZxGPN7x5jyBeIEG I3Jf1V3GIlNluCCtmXp3am6eySAYiBfIZ/Zr9oxvURCjWt7DoR5pq/2oW0ViOoIRkqhq LH1zz/kRy1I447mNJTS82UHhTmocmr92+zrluzoIz7BW/nVylg8oh/q0ml7WAi/1O8iI UcKsx8QO+v/MBDj16+3zZIAcQ+q9BXDrGmHu4Y0Y77yncsp7QMzlqqZ6AhUls8dwO5N0 bGVMJyQpEN15KUC25Wcubi2kUJmiYYkYdx2RrMH18cbiwclweFTRiCr1JdLZuQvG+hnh 7IBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781271437; x=1781876237; 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=KgAVEoo78tlaYfkuOLNp5/i9qrACsjmRKbV+G3pQtWs=; b=L3b4+iuPeE9B/1ykafuCLS1/pQbX1MwEd+usLCfd15X1/rGMhE5UlSOcp/3KYTCs1u 5rBP7PrwWiJyl2/CSsO2YBhDhxPKg+gkV50ICi4qhJwKenQGjGFaPVSvRIscO+lV7kHT hTaq6k4wo2F6qIHyPb8fq1v3o850ppPjNI5tHaKhgpuW2fGEpIr5VqaBSgv/rVvD9yAA 5pDAt7zlOH6/3SmZXIEBKWh24SxxC4MX7CJT/y7vzhdoXbcdEnrZJpJL1PHSjUVz2dN6 h3nOdrU+ozgwstgwBCGrpUStSBuO6W4px+Jj7pPn5/KyMVDbC0YDbBWow1bNraDq+UMq VcCw== X-Forwarded-Encrypted: i=1; AFNElJ/PYoDCYqZjkZAiAtRDsetiQetAc8qce4n1H2UVHV44J/MLiOvgDgqO7AcovOy/nb8OQkGVEpLvFdK+Kh4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5D+cYTTrPBcm22Xf2I3/Q9s38UB4R6fxRIAh7D6fe6hcBfeO0 XrP8UlnFwab+pV41Trmi/yhhh0QS5o24HuwmElk9+SHcG/tF1WbqRGpe0gWufTa299sLPQ== X-Gm-Gg: Acq92OGms9Pkudmny2Otgp4pp2MW9KqIxPWutJGj/bBAvcgqk2pbJ6y9eafzDF2qLZg 5/VCqxIxRoBLpbVntu4G0rxoJdGslEZenQM+98WqNSirmTnGq6dnlv06rv/rSGKOwniAeQOqug2 w98R9we7cqdgGN+Kv7XsaSp6OxwGuOMAu0T6qE5vUU9Yw7XH2eakGCJMaQN6M7mpQf6CmcX9vtc LGE5i0vYw+nQQnaZkad7KS1NIeMYseFr3Yre+jo2yGykmFO3ciKdmB7Bm8bO4kTHFFWVjh28nh7 4Z06ctAOdqRPNN1x1yu7krKgBPDAwckQNTZ69U1HiUnY4og/+SCg9/FIb9hJdzXsZ3FZV/T5xzN 0sTMDqawe7G6Ox08URNY3Icgh3AR0e7Y+dtFB41X4hw2FM8bIcOEQ68L6GeukPtqK8oXaltpBlk j0ILcjc0KYhqzlp5DMZbmfv+aC6USbqRS4cFyDZjywey1nAXw7jLbc1gPPVYtXrnE= X-Received: by 2002:a05:6a00:1908:b0:835:45bf:9660 with SMTP id d2e1a72fcca58-8434cec7be5mr3165257b3a.42.1781271437302; Fri, 12 Jun 2026 06:37:17 -0700 (PDT) Received: from KRHW1CJW23.bytedance.net ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434b00d3f9sm2120786b3a.41.2026.06.12.06.37.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 12 Jun 2026 06:37:17 -0700 (PDT) From: Zhao Li To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wifi: cfg80211: reject unsupported PMSR FTM location requests Date: Fri, 12 Jun 2026 21:37:11 +0800 Message-ID: <20260612133710.93544-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 FTM location request flags are syntactically valid, but they must be rejected when the device capability does not advertise support for them. Return an error immediately after rejecting unsupported LCI or civic location request bits so the request cannot reach the driver. 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/wireless/pmsr.c b/net/wireless/pmsr.c index d6cd0de64d1f8..9a68180605891 100644 --- a/net/wireless/pmsr.c +++ b/net/wireless/pmsr.c @@ -109,6 +109,7 @@ static int pmsr_parse_ftm(struct cfg80211_registered_device *rdev, NL_SET_ERR_MSG_ATTR(info->extack, tb[NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI], "FTM: LCI request not supported"); + return -EOPNOTSUPP; } out->ftm.request_civicloc = @@ -117,6 +118,7 @@ static int pmsr_parse_ftm(struct cfg80211_registered_device *rdev, NL_SET_ERR_MSG_ATTR(info->extack, tb[NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC], "FTM: civic location request not supported"); + return -EOPNOTSUPP; } out->ftm.trigger_based = -- 2.50.1 (Apple Git-155)