From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22DFF386455; Sat, 12 Sep 2026 10:36:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209414; cv=none; b=kx4H38BiYLIoLePPvevikXgnRANkc8QGUmg7AkoACvkyjqJxWn7WMz9ypRqi5xdXTFlLSW4pQLl0oSPcUi3TdX5THBCgU14NYrJ6MroHZ5TaHdeZp07bxFG5O9tjkRzT4zcgH2JtcpA6iCV8ZbaQPamNehPH0vETcxKCIDJ56iM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209414; c=relaxed/simple; bh=6fS9H3EFf/Jn5cW1Zhp4CKJcScb+J9rNaLZj28d6lBw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iAXA32Fzqrh+Va19Eq9CYdVof8ZV1d8earGFldicA9jXz9F2Stv02jjhu/NbPsPwOU6BNsl1Y1K2GXbEh1O6i17iXhya0SA4fx+Fs1gYb6nzl32lVgJ8KzhIcxifUXatcoB/SMf7SAzU9Oe1jl7KnwWhl7AKKl4XkoZmaSwRXo0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ypVYyB5X; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ypVYyB5X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E27731F0089A; Sat, 12 Sep 2026 10:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789209413; bh=C0pNY0IeaumKaf3BdFUfq3gJOBV2QfludzwZx3bH+Rc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ypVYyB5XJy8a8Ut+m1F8zipwKwn6dVn9BfCvMwiS1B/j68wdsXgzIKzSp0KgaKpkI cgQpN1EyR8DYWNPMS1n7/iN0ibd5JmnF90oWZUlDNR/RldjMXvQWwn+eBr25gI7r/M nraIUAzOmr151GHhb96XjgqZ0y10FiEIAp2l209w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhao Li , Johannes Berg , Sasha Levin Subject: [PATCH 6.18 0815/1518] wifi: mac80211: skip unused probe response countdown offsets Date: Sat, 12 Sep 2026 08:49:44 +0200 Message-ID: <20260912065641.873501860@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhao Li [ Upstream commit fd2bf5e718108c00732eb07fd94a5d8830f62a9f ] mac80211 copies cfg80211's variable-length countdown offset list into a zero-initialized fixed-size array, leaving unused entries at zero. The beacon branch already skips those zero entries, but the AP probe-response branch writes through them unconditionally. When a probe-response template has no countdown offset, the write through an unused zero entry overwrites resp->data[0], corrupting the first byte of the template. cfg80211 already bounds explicitly supplied non-zero offsets in nl80211_parse_counter_offsets(), so this is a zero-sentinel bug, not an out-of-bounds write. Skip zero probe-response offsets, matching the beacon path. Fixes: af296bdb8da4 ("mac80211: move csa counters from sdata to beacon/presp") Link: https://lore.kernel.org/all/20260708195911.84365-6-enderaoelyther@gmail.com/ Assisted-by: Codex:gpt-5 Assisted-by: Claude:opus-4.8 Signed-off-by: Zhao Li Link: https://patch.msgid.link/20260723011001.76851-1-enderaoelyther@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c125871adb62b..89eb340e982b2 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -5140,7 +5140,8 @@ static void ieee80211_set_beacon_cntdwn(struct ieee80211_sub_if_data *sdata, if (sdata->vif.type == NL80211_IFTYPE_AP && resp) { u16 *resp_offsets = resp->cntdwn_counter_offsets; - resp->data[resp_offsets[i]] = count; + if (resp_offsets[i]) + resp->data[resp_offsets[i]] = count; } } } -- 2.53.0