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 9F02937E5DD; Fri, 7 Aug 2026 14:45:40 +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=1786113941; cv=none; b=EFMh5ZKrots3EwXgEwTaJ8rmO1CQpxAELJA2sGoaBv6QfgBgs8Vm3HAJ1XfF9KAxVeNX84q4xOExE24t+ABuILXmRGi3Pwk79LYBvcddxgbIud259FS/D3u6tRbh2qmfuhUZ4yL8+ijJlUvVqXrGm9F52enD1sr+/rLtBz9aXAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786113941; c=relaxed/simple; bh=wG5hEbkB/eYIxvqS/QRqDprrVc/H6vlN0YvIWfumWWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sf00aXNjcDz16ofNxQTdcosmvazgOjoqpbgClIjIfuJgBzZ4Tgo3D4YVQE5OKQap1OSbW0atIda3SAAZD6Msq1dRRFzkbb8KdBLxTd16BPTix6qCvpEnezY1u+H92dYnjuS0QW0KKtriFLYKFzNPcXVu4jIN+aZmq4CRlR12iPY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KX/jlYeZ; 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="KX/jlYeZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6A591F000E9; Fri, 7 Aug 2026 14:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786113940; bh=wZHMmFqqDmLYp7D6L2BQSku/pBne4mcf8b1nWCAQ+UA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KX/jlYeZ56tkG6yFfTu1GoRwgWWC0kxJn5EC7P3XvkBBEayFUYJX/QAUGI3kUo7k+ DMC8HUoHpMG3PBv7IjWjn/1Trl9acut0GevF9E1c0dkCRGfRTogKrsTJBEIsC10DJl MuD1r3gSjjxtUq7/oACDbkqLVBJPHNzS1vbkttqA= 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.12 089/337] wifi: mac80211: validate individual TWT params before driver setup Date: Fri, 7 Aug 2026 16:34:52 +0200 Message-ID: <20260807143420.444608388@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143418.516897842@linuxfoundation.org> References: <20260807143418.516897842@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhao Li [ Upstream commit 0502d5077e419427d80f4d46ba95d0067f5fb916 ] ieee80211_process_rx_twt_action() only partially validates a received S1G TWT setup frame before queueing it. An individual agreement can therefore reach ieee80211_s1g_rx_twt_setup() with twt->length too short for the full struct ieee80211_twt_params. The individual path passes twt to drv_add_twt_setup(). Both the tracepoint and the driver callback consume the complete parameters block, not merely req_type. Do not pass a short individual agreement to the driver. Broadcast agreements remain unchanged because they are rejected locally after accessing only req_type. Fixes: f5a4c24e689f ("mac80211: introduce individual TWT support in AP mode") Assisted-by: Codex:gpt-5 Assisted-by: Claude:opus-4.8 Signed-off-by: Zhao Li Link: https://patch.msgid.link/20260723010928.76551-1-enderaoelyther@gmail.com [edit commit message to not overclaim lack of validation nor understate driver impact] Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/s1g.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/mac80211/s1g.c b/net/mac80211/s1g.c index d4ed0c0a335ca..2a23e431cbb5a 100644 --- a/net/mac80211/s1g.c +++ b/net/mac80211/s1g.c @@ -101,6 +101,10 @@ ieee80211_s1g_rx_twt_setup(struct ieee80211_sub_if_data *sdata, struct ieee80211_twt_setup *twt = (void *)mgmt->u.action.u.s1g.variable; struct ieee80211_twt_params *twt_agrt = (void *)twt->params; + if (!(twt->control & IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST) && + twt->length < sizeof(twt->control) + sizeof(*twt_agrt)) + return; + twt_agrt->req_type &= cpu_to_le16(~IEEE80211_TWT_REQTYPE_REQUEST); /* broadcast TWT not supported yet */ -- 2.53.0