From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5694662A07; Tue, 16 Jan 2024 19:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435144; cv=none; b=TYnoSDNh+c8lBADQtAB06ulUzmECxd+XY5+RvaiM+BzeXBCNjAex38ID4whAtiXKmFH25He3/8B54TQL69FpfDUR6itOCnX4BUSsYYGrGtiSAvSHVwcmoxPiAz6xBx5BvfN7tQMkAvX4xiEquxdsFF9fl5Eu/SMsamn88XqVxyo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435144; c=relaxed/simple; bh=DLXBG8JCaa5ys2bFtaKoPSzsBxvXML071j0o8lBy4tY=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:Content-Type:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=FBWi6gAyMrdvGZeKJmYo0MycMWBlJ3B55XiwARHliWHz2C9hjYiGP3uEevkh/KZWNllFuHHNvsVN1NWXSzQqLMi+rBzjBuMPxvg900NmKmkSgetU4M+OwXc/w9jOyE3hb5PdWZD02n4rsWkawunNSodnU9vsr2d6FZmP49m2fNA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oahnl6CG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oahnl6CG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03ACDC43394; Tue, 16 Jan 2024 19:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435143; bh=DLXBG8JCaa5ys2bFtaKoPSzsBxvXML071j0o8lBy4tY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oahnl6CGujcrTu/XZBQTXwbQ756CGN5Ll6CDeVi8RpebpYtGXBc5Lmr9cDX5Mvd1H 6R/epJ2lqmJTfVP7ba0eNcCifBQEgRwXlnDswJkglWrSv/MM55dgdxequkI0unKYHS 0w4p2j5C6B4aoFUFFbM39vza2BcLQ8ba0WUF9rgjHONh7wgdHq6KbKQumPMY3hqgml +RQ2grlXB0gwZfkVf4PwKarHBKKUUUqUpiAOSOeCfr83aFuIXeraJEcr1rx7OHrgCl Aqi8YdZxi3aluKl2eSvXCrSNszVo5pp4JPhw9Pv8lJtDF7Zyf54YZmq5Fqj5Iqd5Qc lfmT54dg7BQYw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Minsuk Kang , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo , Sasha Levin , kvalo@kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 13/47] wifi: ath9k: Fix potential array-index-out-of-bounds read in ath9k_htc_txstatus() Date: Tue, 16 Jan 2024 14:57:16 -0500 Message-ID: <20240116195834.257313-13-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116195834.257313-1-sashal@kernel.org> References: <20240116195834.257313-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 Content-Transfer-Encoding: 8bit From: Minsuk Kang [ Upstream commit 2adc886244dff60f948497b59affb6c6ebb3c348 ] Fix an array-index-out-of-bounds read in ath9k_htc_txstatus(). The bug occurs when txs->cnt, data from a URB provided by a USB device, is bigger than the size of the array txs->txstatus, which is HTC_MAX_TX_STATUS. WARN_ON() already checks it, but there is no bug handling code after the check. Make the function return if that is the case. Found by a modified version of syzkaller. UBSAN: array-index-out-of-bounds in htc_drv_txrx.c index 13 is out of range for type '__wmi_event_txstatus [12]' Call Trace: ath9k_htc_txstatus ath9k_wmi_event_tasklet tasklet_action_common __do_softirq irq_exit_rxu sysvec_apic_timer_interrupt Signed-off-by: Minsuk Kang Acked-by: Toke Høiland-Jørgensen Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20231113065756.1491991-1-linuxlovemin@yonsei.ac.kr Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index 672789e3c55d..d6a3f001dacb 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c @@ -652,9 +652,10 @@ void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event) struct ath9k_htc_tx_event *tx_pend; int i; - for (i = 0; i < txs->cnt; i++) { - WARN_ON(txs->cnt > HTC_MAX_TX_STATUS); + if (WARN_ON_ONCE(txs->cnt > HTC_MAX_TX_STATUS)) + return; + for (i = 0; i < txs->cnt; i++) { __txs = &txs->txstatus[i]; skb = ath9k_htc_tx_get_packet(priv, __txs); -- 2.43.0