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 6C0C0445AC1; Mon, 17 Aug 2026 15:19:11 +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=1786979953; cv=none; b=bz9zFNXsze8ghMjMe6nXnVTamW7m1jM3QvtxUW5FojK0NYbuWOTVdg8AT8mQu3bAJQWSHRmjZm2ouh7eoJY9lXXL3Wwsx8t/RE1uvm0UIM0/OVMjuYGUh9ypn3KS3OnRxTxbrBechBqA4P8CXhLsTjUvfCg/e4aIv7a6s4jki9k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786979953; c=relaxed/simple; bh=IMNpFByolknxHNncNx+F/JbwWZQtVCsHpB1m7IiC5js=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hGhf6JvOSPk7L+79b+ZXeLE/t9o0yJy/vTFyzbWl2nSRwtij/Jic8q6tO+8oxTMcsV9c9+iDGPlGZ4lPlZwMM8aA2zJOntvp0r7xHR1TlCRPvyPyOyJr7IrOVooO2oARrImCCOSWARcYR6Dsebm7us9uOloF6ih92HzKtj11G3k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0pvHuFc5; 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="0pvHuFc5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 783351F00A3A; Mon, 17 Aug 2026 15:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786979951; bh=ZRSD1K4GnmT33Fta7QLRI8U1n3YitABxCpke2SvzTjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0pvHuFc5D9WaAMk6N2KhA1zD76d+Sa/xoQrFg8pRvSgVlrVirg6G+Jim7fOucHogT Q3eG1lWzYM6p9Qyjd628X7bCJKDBLsGBuG+qAjOz0ipQBz2ylmmhDqpOXlwg90vlQv wNyyugfR32IxNuu62KCRdzvckqdIBAGH3kCaNOVs= 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.1 365/609] wifi: mac80211: validate individual TWT params before driver setup Date: Mon, 17 Aug 2026 15:31:01 +0200 Message-ID: <20260817132556.498642492@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132543.039278408@linuxfoundation.org> References: <20260817132543.039278408@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.1-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 c1f964e9991cd..9914390ff31ff 100644 --- a/net/mac80211/s1g.c +++ b/net/mac80211/s1g.c @@ -100,6 +100,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