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 0D8C9356A12; Tue, 21 Jul 2026 19:18:04 +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=1784661485; cv=none; b=f97hYu43FLYB/WZ6Rp5+68Y6Y+1sQqH5PXCANiCu4HjzDP/bnuJe73V8IquLSa0PNFsfUd8G/4P1feCcnjxWvQf8PyABEr/RhYKcqat0H+D8tXpLnvtsJUH+93Ny88EbE5nWxBgxTwUcjqAVgxVEb+oTaHZ1JTFkOqRau3pNn2I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784661485; c=relaxed/simple; bh=tcslv5Baljadg38vCykAEi3Uh2V7+OG8WriJX5xGD10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fLL380LEOP5ZggeLzjq51TpKkm4KUltKkcmKedHl3GBQrvps6krlJ+xQb8sUAR5InZT1zV28s6UQhSjxsjnLm+CuL3BO7G8ASRKI8vAiZbWA/YFz0Sax0V9JlwD7lOFAKrsDBPtPujp3KfFe3VgMdAHIH80gpvfiD3oNir6cdzY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jadu4jIK; 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="Jadu4jIK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73EF21F000E9; Tue, 21 Jul 2026 19:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784661484; bh=nPvu5VdM2U59f+I3XKnZTWqirmEazcOQ5i0U34XU3jQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jadu4jIK9pKe2wBwBXPlBSDCtlDdvLAb/yMi1TVEm6ouOi77Zri0iu1z6S2SQSraD 4aFyMMXyxj3JN/seSnsUhkP3aPXiz1ZevIJ2U7ZCxe0vZImQQkcE3CBZJlhZ7iFW0X phGOiLqolZntWmSgRkHS518WajEOZ1F80p2t+HUs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tristan Madani , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Jeff Johnson , Sasha Levin Subject: [PATCH 6.12 0082/1276] wifi: ath9k: fix OOB access from firmware tx status queue ID Date: Tue, 21 Jul 2026 17:08:45 +0200 Message-ID: <20260721152447.929030013@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tristan Madani [ Upstream commit 7ce2f118a2389e8f0a64068c6fe7cc7d40639be0 ] ath_tx_edma_tasklet() accesses sc->tx.txq[ts.qid] where ts.qid is a 4-bit hardware field (0-15), but the txq array only has ATH9K_NUM_TX_QUEUES (10) entries. A qid >= 10 causes an OOB array access. Add a bounds check on ts.qid before using it as an array index. Fixes: fce041beb03f ("ath9k: unify edma and non-edma tx code, improve tx fifo handling") Signed-off-by: Tristan Madani Acked-by: Toke Høiland-Jørgensen Link: https://patch.msgid.link/20260415222343.1540564-1-tristmd@gmail.com Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/xmit.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 35aa47a9db90b3..26faccc98dd82d 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2759,6 +2759,11 @@ void ath_tx_edma_tasklet(struct ath_softc *sc) continue; } + if (ts.qid >= ATH9K_NUM_TX_QUEUES) { + ath_dbg(common, XMIT, "invalid qid %d\n", ts.qid); + continue; + } + txq = &sc->tx.txq[ts.qid]; ath_txq_lock(sc, txq); -- 2.53.0