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 6C8DA2D7DDB; Thu, 30 Jul 2026 15:16:49 +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=1785424610; cv=none; b=bWmbYqTa+8hSGH27xmwaFVRXO7ZtYXfBvBPas04qPpiT5+fLeuAYOfUGeWcuiUsOLktmGYTc64D0fKqtjuhcAvjXEbW/PHwqnQjZ+pi2xKXfhPZk2f8cOdA1G2GUHto91wTAtWGMzdX/N2PVkW62rZG+dP5e3cN9WVfoFOZWFJA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785424610; c=relaxed/simple; bh=xwRLtTZlYYujolBuKcaRU3lSU+SFBIPKwce4h13Do8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UVY4SGbcZrk23DSRyyqurSjJoDT48yceY3bpv9KXGzrgJKGSta5fCmXph2x6xBFzcne7NdnciXLYdeKlQDxvU7vIQLs9a0gZcyyGRQQnLC7CoJScvnfSMBF4Mcj6xrc7CVeXCyD3nlX3HZGe7dGC3a7FQtcYPwrMrmQbNQ/SHIA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=h3WqFX9S; 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="h3WqFX9S" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C74BB1F000E9; Thu, 30 Jul 2026 15:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785424609; bh=pc0+SJfzosaWhOk7c8tjL062qJBUC/Tau4hwLblJX6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h3WqFX9S1UqOA8cAlUYCMfUXvFNT3GGptcGq2OFrgELG5Lwhk0pMUpkaC2zRO8Wu6 /BvNDJxU5ZH0lpWinLEa96UPigXO81L02DGpv8O9ayLggXUPRtumgGDiXq6MOM9o2F ecVjRA8VZBLS5WQiRO3UDL+Dmu7+2Y79fiARSwcc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vasanthakumar Thiagarajan , Tristan Madani , Jeff Johnson Subject: [PATCH 6.18 452/675] wifi: ath6kl: fix OOB access from firmware ADDBA window size Date: Thu, 30 Jul 2026 16:13:02 +0200 Message-ID: <20260730141454.742702355@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141445.110192266@linuxfoundation.org> References: <20260730141445.110192266@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: Tristan Madani commit 44126b6994eeb28f2103b638e698f40a1244f327 upstream. aggr_recv_addba_req_evt() logs a debug message when the firmware-supplied win_sz is outside [AGGR_WIN_SZ_MIN, AGGR_WIN_SZ_MAX] but does not return. The out-of-range win_sz is then used in TID_WINDOW_SZ() to compute a kzalloc size and stored in rxtid->hold_q_sz, leading to zero-size or overflowed allocations and subsequent out-of-bounds access. Clean up any previously active aggregation session for the TID first, then return early when win_sz is out of the valid range, instead of proceeding with a broken allocation size. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Cc: stable@vger.kernel.org Reviewed-by: Vasanthakumar Thiagarajan Signed-off-by: Tristan Madani Link: https://patch.msgid.link/20260702005020.708717-1-tristmd@gmail.com Signed-off-by: Jeff Johnson Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/ath6kl/txrx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -1723,13 +1723,15 @@ void aggr_recv_addba_req_evt(struct ath6 rxtid = &aggr_conn->rx_tid[tid]; - if (win_sz < AGGR_WIN_SZ_MIN || win_sz > AGGR_WIN_SZ_MAX) - ath6kl_dbg(ATH6KL_DBG_WLAN_RX, "%s: win_sz %d, tid %d\n", - __func__, win_sz, tid); - if (rxtid->aggr) aggr_delete_tid_state(aggr_conn, tid); + if (win_sz < AGGR_WIN_SZ_MIN || win_sz > AGGR_WIN_SZ_MAX) { + ath6kl_dbg(ATH6KL_DBG_WLAN_RX, "%s: win_sz %d, tid %d\n", + __func__, win_sz, tid); + return; + } + rxtid->seq_next = seq_no; hold_q_size = TID_WINDOW_SZ(win_sz) * sizeof(struct skb_hold_q); rxtid->hold_q = kzalloc(hold_q_size, GFP_KERNEL);