From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 A0B133E1226 for ; Wed, 8 Jul 2026 19:59:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783540800; cv=none; b=B6r9oizk1UFV0yufZqcyekoQKHWU68K6v3PS37qumSqdyrZeLq708p/qzE4Xhs9UlsmYQXBuDcLAEfRf1OoBeT2A/2jIWQZL0ryPxmz8bkfqJv+nqM3nayI2cyapkcxDfk3dg5gJ7/kx2TrXIS4CT+JCYxZxGROxidVlfoGEEuM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783540800; c=relaxed/simple; bh=w/vwlMcntnTxyo/2UhLb95oSOKKha6FuDCeNrxA7k88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TfGdAzGJx8ZhShHs0fnZklBbeyKathWV6U8PsBDoGFe+cK2pGEKSi4/2csd/hPTunZQOYtXi0+vWa6nTwyYK0fO+LrfFsLKxTiuciFO7OVX07I53AxGGzXtpTqKMYoZjeNOxQjBEUYI8SxKpbI0BPBF9ECTHXvYqdTN8+i9pTlk= 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=gz01sERd; arc=none smtp.client-ip=209.85.215.171 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="gz01sERd" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c9b373d5af0so820554a12.2 for ; Wed, 08 Jul 2026 12:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783540799; x=1784145599; 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=NXKQxSD6UbvExaibIKrfBf8rLHetRRlZMcfn3lvIQPw=; b=gz01sERdS54Zn+LDyZ7MToEH2eMMI5CxivKkPhxHNM5CU6XE7tnY2lKZPhChuCnyLl l93UZl72CVGg1aR4JyrdGKpSNRWndfxGHJ+jgrRGYsnya6LRjkNvcfEsWEJUkAeAODfc /e8UXRSqMnKVSyVD2+R8ugbBqJvCY3yrVE2M5rEa690Ik2tqdH3yhVUv685vnQyKRkrp pKiW/RCZfZLTMEavloYlkFIFjX/hum7WreRS+zEZpAHeU+ei6qAl2TaTa1XDIJ/Yji/G SeK7jfYUMObgkLQrA9NGIWtuV00usK4KhR2xAVCZYeY8weLweKQOFNjdqjoF8J2e9gzJ wYfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783540799; x=1784145599; 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=NXKQxSD6UbvExaibIKrfBf8rLHetRRlZMcfn3lvIQPw=; b=H+ql4aK1MFf6UWYEVRGn+T9LgsOYsCpok2WGasEywIDar8o6LjCbILpV8lMQAsZF7c MxJvq4xlRmcCqmp5K/ymJ1fHZnkWluPaxQnpj22BjYWY+mX2/sA55LrtHiBhc2RRDBNG 2j7+fLiHgEFQcPC8n7cWpPQjz61WSYm3673rmP/tScgSe1qHsDpua/447ysfDibogNhQ qfQ88B5m2tyePAkYXa3SxW5INdg+KCpBctyBo5EdEYKrC/aCATLHx2NcC1B16pOXJ4Qm CefUzx4j4XcTeKXVfSZwu/5kd+d0A40ZSQQ7ps2i+8pWM1KM635HoRHXcQUvQfRx5FZr /veQ== X-Gm-Message-State: AOJu0YzQ022SSmNmAojShZn/Dx4itehsAm1FIgRtmCVxCRsYV0lxlAHg dAGv1lYlcZiLT/Qur+Yi92nv6yRBmh0nEZYWvmAtZDnCh/2KMprCzRfqeHWljDL2oy6EBw== X-Gm-Gg: AfdE7cmtiBO9AcZ9Sf6JrWJ/xZ/RRZjdJ6D14BR+o1swts1SzObvnUaqHFviKHXPzdm ldLiuNNSqPeuZAE44Dm90F1JohLLji7lavFznWQPzAMIfLSm1NBIQHivdnNxgQ7muE4YRILBhLg 0rVeja/2mKfPbezRpuuEvI2tecFuXHdjDHyb9N8qSw9SgqheOfCryFxpwGXlwHQHBadS5NsnnHh Cs1j59zFkXt/7jCR/vUL29HLbj/SVNqDdGZlKf1omCjLw1UaWfg2ktRHxADGVQjxQbKO0gpfwEk TMiur6OM5AG7gzyj7qJXC4Ug5RXVpW1p4aDK5T+OMmxBN+vcfwayX4WhNke+lcbRrU891bJ28hf NTQy/nRUmznOWO5HmAxre3rSLa2uSrXtNS7xssJQZL++nBqx880URDdWaDl2Jk03HCkVTxebv4Z I9raWtHGCPiSNxkBffAA09mEAGN9PSNBtmtRsbB0JdqiIKs1F3aFWr X-Received: by 2002:a05:6a21:4902:b0:3b4:8717:1c21 with SMTP id adf61e73a8af0-3c0bcbcadf5mr4956916637.35.1783540798746; Wed, 08 Jul 2026 12:59:58 -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.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Jul 2026 12:59:58 -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 4/8] wifi: cfg80211: guard optional PMSR nominal time Date: Thu, 9 Jul 2026 03:59:07 +0800 Message-ID: <20260708195911.84365-5-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-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit pmsr_parse_ftm() rejects a request that omits NOMINAL_TIME only for non-trigger-based PD ranging. It then reads the attribute unconditionally for every non-trigger-based request: out->ftm.nominal_time = nla_get_u32(tb[NL80211_PMSR_FTM_REQ_ATTR_NOMINAL_TIME]); For the other non-trigger-based request types NOMINAL_TIME is optional, so tb[...] can be NULL and nla_get_u32() dereferences a NULL pointer. Keep the requirement for PD ranging and read the nominal-time value only when the attribute is present. Fixes: 8823a9b0e7af ("wifi: cfg80211: add NTB continuous ranging and FTM request type support") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5 Assisted-by: Claude:opus-4.8 Signed-off-by: Zhao Li --- net/wireless/pmsr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/wireless/pmsr.c b/net/wireless/pmsr.c index 34c3625f7fd5e..d1e2fae5bc0e5 100644 --- a/net/wireless/pmsr.c +++ b/net/wireless/pmsr.c @@ -263,8 +263,9 @@ static int pmsr_parse_ftm(struct cfg80211_registered_device *rdev, "FTM: nominal time is required for PD NTB ranging"); return -EINVAL; } - out->ftm.nominal_time = - nla_get_u32(tb[NL80211_PMSR_FTM_REQ_ATTR_NOMINAL_TIME]); + if (tb[NL80211_PMSR_FTM_REQ_ATTR_NOMINAL_TIME]) + out->ftm.nominal_time = + nla_get_u32(tb[NL80211_PMSR_FTM_REQ_ATTR_NOMINAL_TIME]); if (tb[NL80211_PMSR_FTM_REQ_ATTR_MIN_TIME_BETWEEN_MEASUREMENTS]) out->ftm.min_time_between_measurements = -- 2.50.1 (Apple Git-155)