From nobody Tue Jun 16 03:46:38 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BA29394782 for ; Wed, 15 Apr 2026 22:23:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776291834; cv=none; b=qftcR+4m04bjGC74re1UM8vj+ATrZ3ExbzXV1EDebj5YAvTAH6bQkVLpNHdUubZrYpd8vi0tJI0WyCEK5tSFgc0VcDJIGPxcJ9+L1WvgmhE5l58miz8F4mVgpHbiWd7VwmXFlqobIpY1eDBdkop3kcYcttLc/nXqjOsm03X/Aq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776291834; c=relaxed/simple; bh=auTohr0SMVKyIdScr22AeWHWHZULiU0EJD6viz3l7Zw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kEdt0kQehfsW7KLrMTYdqmw005cAf4CkctzYmbKfikZIpw2CWZ7aiaKlEiCUVRRX41mvybeKr1oDchD9Lhcs/sedltqNg99OTA9Z1gQsJQkh1EzYjqfwSfLi7RGL+S4SviKS5bkfV9vF//RQ09AXPOcXvmL6h0NM/YTbiedSnJM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=M7l9/Dcg; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M7l9/Dcg" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-43cfd1f9fd1so4707548f8f.3 for ; Wed, 15 Apr 2026 15:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776291831; x=1776896631; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b7l7g4cargiS0FGk2gT7876H80IPBqE15qVq2PFnB98=; b=M7l9/DcgaK4fHSkk7bz8DwEGTv8MM90b6mnO+jbF9spPCmxVA5hHJBRjEkJGheOCCK 9dEs7iFL37pU/CRhWdnJRydsoi9LsdgB1DobrpkSIkpyj78EXoIwA0uy1G7PuJWMQ47c htaHW00B+V8ICNtzosUJLg0z4qlvUipK3g9ujpakXY+4zoROUTg3Wqx8psSL5qmaN46m 5KhHV45FWSDah13t2WglNwmnMRzSiuwLXaJuGRQqGPIEASt/xX1ma0hgubWnV2mzkQye PZlgRxuSENbKSAkOH8UGjqTorJ4QW5tVBYshkDyN97fwGboP7m4fkH20Tg23ozlTZRCO 9RVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776291831; x=1776896631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=b7l7g4cargiS0FGk2gT7876H80IPBqE15qVq2PFnB98=; b=XsE3FdUbIEjh+OM5/E/IdECqTNSgf014juk5i1DhbTHCbb8yqrjgrIs9IrYRpfGKt/ J6A4t05ZM+JY2zAWzih80GrJF0g/Jb+X+gVu1CiUY6MCESNskG3EDAHriDkPdgF5Khdu hMnBykyD0J5OB2IY+39WAVwMuczk0lNYuIWp0gpuknE2yMWi54DLU8jhsYh34FTc6QRC 0I9z3Yvb4KeniufjM89hG8/k8rdqnf6uS/Ix0N2kHcz/0sqnkYyvEJ7/dfBpQ7FvcR7e T53zSFYF+9BHwzjSS62w4yMviPCF8Ntrzzy0pJ2Tq9+NWCpw+rhDbZwylTFDhCCkdz1C Y+oQ== X-Forwarded-Encrypted: i=1; AFNElJ/kVhGcO61B6+SwX4dUdouYUuPtxUz8ZBrs65xpaBl9UVuYiPCgolXRAJYA9ASkjjkYyfIbqcb17+NfAUk=@vger.kernel.org X-Gm-Message-State: AOJu0YxJhosf7spfiWsI9KmqyeEYZJ4l2XM4IEP2qEbfWCy2zWWSFqQ8 KsDBKjZcumxpbK/VmCMMOxqz3u9wmcrAPnpEFNxkkejF0XoqzSqgSV9TzZh4MgYX1A== X-Gm-Gg: AeBDietd1SrL5uEOwzwTneRYM7c5YVnsGU5WMcmXTOs4sYcKu5yZ3ZxLdgOUYzC3uqV R0nG85yXU9hEPPGALNLvKi8e81XTWsI9lNPTUVNaFm4xUF4oFxOcJFRbtnuD8fM+phzfz/Q8wpd lqUM4Gfz73p8yohHC9oaXOp6jaQ6zxMpPPzepv9fLfONZGpfN+/EZG+5XUYff6KYBh9Xaarxknk wTa9sYCeW0M3nrykN5BgrdOcCaly7pU15h6O3VxOVZZJynm80YI/YjGSZ7t/9hWB+6M5oZsVMch TEQC3s5OqF/7hXoeVyIeyc9x4Xj4lDPL8NFkoNLj1bk5EZmnxamRWJwQa+bAfh/dJ64Hjhr2gZL 8szNiYmw/zcSEt6UXsaPx3wb1RMG8Y8mhS10LVzIyUAFybfgNjuODJldWNFGkChnC0yAJquN57X 9Qk4Q= X-Received: by 2002:a05:6000:2013:b0:43d:6fb7:fee2 with SMTP id ffacd0b85a97d-43d6fb80156mr24109192f8f.45.1776291831454; Wed, 15 Apr 2026 15:23:51 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43ead402ee8sm8339591f8f.37.2026.04.15.15.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 15:23:50 -0700 (PDT) From: Tristan Madani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] wifi: ath6kl: fix OOB access from firmware ADDBA window size Date: Wed, 15 Apr 2026 22:23:47 +0000 Message-ID: <20260415222349.1541181-2-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260415222349.1541181-1-tristmd@gmail.com> References: <20260415222349.1541181-1-tristmd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Tristan Madani 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 OOB access. Return early when win_sz is out of the valid range. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Signed-off-by: Tristan Madani --- drivers/net/wireless/ath/ath6kl/txrx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/= ath/ath6kl/txrx.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -1725,8 +1725,10 @@ void aggr_recv_addba_req_evt(struct ath6kl_vif *vif,= u8 tid_mux, u16 seq_no, - if (win_sz < AGGR_WIN_SZ_MIN || win_sz > AGGR_WIN_SZ_MAX) + 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; + } if (rxtid->aggr) aggr_delete_tid_state(aggr_conn, tid); -- 2.43.0 From nobody Tue Jun 16 03:46:38 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEBDA395273 for ; Wed, 15 Apr 2026 22:23:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776291835; cv=none; b=KRSZQxahTxAn9zwpIg7Xy3NexXplkaFOfWNhiq2nfz9ecJ/O70cq/nZkeMuDGt/B6NR5dRHVEN3PoVakFpJLmMLj3E26KLG+8aBHsEG3mejBEfrJ75Ayqq+ARtj2bBLB6YCwKCn8sAWVQRXCw0dBR2TCAAH7g8NS8JELt0XwJ6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776291835; c=relaxed/simple; bh=ODNDMY2kmd5aJtNUY5MrdRY6aBcP3eV0zx1G4cuVvd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iob0mmhheGZE6CY7gcG0q4GHLCA9JvFUkDQLSFcgME+5qhzsj8b6ua9zDs9ODK9rGHB6QC42/t5JyOYdFgOedxSUn43Un57x+AmNuHIF+ovQLSoct8G3uT++SN8ie1ZkVnpWHlZQnaBdMrap0KpMM7iMmPvQiShW0uK0krK6D7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Donyjz8X; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Donyjz8X" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso58532745e9.0 for ; Wed, 15 Apr 2026 15:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776291832; x=1776896632; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3u1BcD9KneeuZ1i2dYUu5QWWTz8ru2YjlrKdP990rg4=; b=Donyjz8XP0hxbwGciyBSefVJ4mYNfkHUJkg9OlRCuT1sf53XhS7JbUMvcxJMU2hj5i 8ZfQW58r+oKA4wnuEdj+zW6bEypzEX+7Bo7DmIdh1bXaI00xo4aKz7NtnBWUe+d4BQ19 Jnd2a5I67b9dlST5xwPUQiXGRXVFEKW53xId5R6453XI9wR8Or7AkENfSJm2JNwh7K2d 9a7Y0x1lufF9rlD6eKDSgHfrZsV52hRU4MCWY/weVrZzOKFMgyCulfVuQUOq2JXziz2s vfPZSEhlOI2+ybV1nJst8Z7s9awEJzMKXlnCZwS6yt5DITnSBvCGxDexuKsol7/MGCJL nMIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776291832; x=1776896632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3u1BcD9KneeuZ1i2dYUu5QWWTz8ru2YjlrKdP990rg4=; b=MLmhNzqxKWbbFmH+5E+4PasOFfrn8m+3H1BDsPMqOokMCKgezEIgfJ3TnTqtGfsWfT K/k9nzjT1IrOMCpF4sGQ0n5I4IJdLhn9qBeepT+xk4lNLLCJSUwezkICLiNceu9aa/Ri F1+ebhvRnfTnQs6w9QD+hYpDhZ22WjmfBakJ9CEB0D6y/turmlHAsdNDkLOb4hAKU6oW 9nQXS79VES1L/dzInzhp2ZZs9QokPzWUQqrXPN6QHNZK4Vbs+fZ9o49tQChnbK++sEBv y5CELsyqJyc1QEjAp78t7Hd6UvWFThuMXbWBNmv1ydZXesvnfIeyxlYWDVdFZPfLAYgt 9D1Q== X-Forwarded-Encrypted: i=1; AFNElJ+eksjvBhMKSkPz3dkR4LmyDoXipq8Wio/LK5opHj18aiisOvq817AzUsPtKLfelB6CWG9BjZ/tv1VUZe4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxjoi1sKsYGoh8Fk6v6id/Knt/YQoDoHlZUpQA6Ot8VRJNPGgCt 9wyyY0SotXdNRwUIap4OQ6cGAHjT5unURutd2qkN9CWKZ/gfvqUxpt+2WWpfxBXUfQ== X-Gm-Gg: AeBDietDH2unJ2bFB9kBgyCkClsBISbRlRU3EAW+WaIipGL6Vz+zhQz4dIV0o7xSm9H raSPw7JP3JvWeTt4Tr8h3V1KF0DvI+tf7szhhBQwNLhm61CDjPULQliQX5586abDYCRAvfI4QXO C6QQiqkTT26CC2riYRpStVS3RY7WcDEQ8CWizydeh1DoqBqZYv2x/hClKgUj0msc29hoE8tByS1 H2bYDBL5VPWSH4aqGefmPfhtjQjDhL8/6KVtGZJNbDmNJLcLwVnvyShx8ZVYhab72ascetUDmuI 3sqG86IuM3sgmbpz9uIXpog351zIQ2Jb4pDTXN9kyfRREfKnHKy02JS6xxtFzXmqM+JSGlaqWCI wH3nAmYSOv6SPd6OB2QwOLFVLrj2oXLMRslYHTNL1f27FtSMysO/wTh2Y/w0pMR0MkOcEzn758E ZQw3JTiEDqkifn1g== X-Received: by 2002:a05:600c:5487:b0:488:ae26:435e with SMTP id 5b1f17b1804b1-488d683d4f0mr323460145e9.16.1776291832202; Wed, 15 Apr 2026 15:23:52 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43ead402ee8sm8339591f8f.37.2026.04.15.15.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 15:23:51 -0700 (PDT) From: Tristan Madani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] wifi: ath6kl: fix OOB read from firmware IE lengths in connect event Date: Wed, 15 Apr 2026 22:23:48 +0000 Message-ID: <20260415222349.1541181-3-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260415222349.1541181-1-tristmd@gmail.com> References: <20260415222349.1541181-1-tristmd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Tristan Madani The firmware-controlled beacon_ie_len, assoc_req_len, and assoc_resp_len fields in ath6kl_wmi_connect_event_rx() are not validated against the buffer length. Their sum (up to 765) can exceed the actual WMI event data, causing out-of-bounds reads during IE parsing and state corruption of wmi->is_wmm_enabled. Add a check that the total IE length fits within the buffer. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Signed-off-by: Tristan Madani --- drivers/net/wireless/ath/ath6kl/wmi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/a= th/ath6kl/wmi.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -860,6 +860,13 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi= , u8 *datap, int len, ev =3D (struct wmi_connect_event *) datap; + if (len < sizeof(*ev) + ev->beacon_ie_len + + ev->assoc_req_len + ev->assoc_resp_len) { + ath6kl_dbg(ATH6KL_DBG_WMI, + "connect event: IE lengths %u+%u+%u exceed buffer %d\n", + ev->beacon_ie_len, ev->assoc_req_len, + ev->assoc_resp_len, len); + return -EINVAL; + } if (vif->nw_type =3D=3D AP_NETWORK) { /* AP mode start/STA connected event */ struct net_device *dev =3D vif->ndev; From nobody Tue Jun 16 03:46:38 2026 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9255539EF11 for ; Wed, 15 Apr 2026 22:23:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776291836; cv=none; b=XJ4ldyYH2XFtM2P49WtuYu0qxfgz5Zc+w7bAkT2ShZen27GgNcD20GhpJhIEOA9lRIHXJeHGBMSnKxsbHbciRjRxvBuNPQOG94UUdy76U4lxf2tb975xCaB6idezrrG8OfkhBO7MOQAVeHn1+c4y5wlnOWZff8yhXDqB5Hw0ysI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776291836; c=relaxed/simple; bh=5KT4zftllyjvMTucsE6urzjf7XJ1mXJBzMbbpQp/Y3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eIXcjODWqqpKIwiY6CLMYTV7LiY4SjwRlE9bYELhjhN/+ShXwqAHDFH0f9HiwBlhE+PngEyXgFOr/vpC2J4PCC5tSgcaFgn0KOAyuhORuaB8oncfsUhoODXsbXgWffG7+2Scu5sd2AqaSbJyUTsNsGUJpiEMnGj1cX41sx8zgUI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=luftM5A5; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="luftM5A5" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4888375f735so72723725e9.3 for ; Wed, 15 Apr 2026 15:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776291833; x=1776896633; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eX0Glenf7dhcpBF0K+wa69LSV3USNbfawO60wMsqyo0=; b=luftM5A5ECMI+/B5ZkbQyTh7ZjTCc4Dy2oQmtmllAqOxoRjboxLp1dATCrXZOkl7IG bd+nmTRf7EPHpE/n2f92/Aay6BHwF7F8tvW+wOMYf6N7nbaXWiKJOCuji+oEoEi3v7pZ TEugTRGTEH87Rx9hxqcnZmrheO2RVjT6O4z6XQJ57RlR90zoDlWeoYl3si4PischvjJF p1a8sRjXs2einsgmhmUFTbQNWhGcfd5bRY8gXnVoaWkRzjpNSuUwomjbjgNpitcUYw27 oObkE3nWgr+WgegF50BWbEAB9y9mPMDU14Of6qjW7OIY6YM45sfLVJZQx/U9KCSxCaPx kZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776291833; x=1776896633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eX0Glenf7dhcpBF0K+wa69LSV3USNbfawO60wMsqyo0=; b=naKx83kJ2it6nbXzhrZUXLyjJxFKIG0DFOxZkjGEXk1RI7KEsF6LDUVSXaF+6x7sKH XEE9HoGg8xV51DPGJ254b9hEvxoDmtKD2Z9nQCfRdIr4doAk6wyBSO8Dn38CbAsi4uNx 1QPCClexyrVbu52iV3J826gnrl/dAVSJvUnLvXm3YWOtTjd5XyDtIS3f+M2NOQIZDhOt ixWOjumWLNfKpdJ2Kt67E5Vw5z7AzER0vIPuzDj7hHMD52UXbY+CE7EyCM3a65BcGc1W vrYNMD3b59l5CfePESSDeMRjvJ3vL/GUuw3R38gSYBPlysp7HIIiTjsPUQlOLguGcY6V sYvg== X-Forwarded-Encrypted: i=1; AFNElJ8/zSOXPZIwVX7m27JdO6HWtthUcQX7dqCyK8XH9z9iQGxvUpqLXKNno+lIzxREQdkpt3UdIeldjv5QbS4=@vger.kernel.org X-Gm-Message-State: AOJu0YzQfNxbe8rwCwiEzxPN8XO999DnLE2ZKxHuQB2pm6eXzE+R+hSc PJA3vcyBQV85+bAybCSJjN4iglAbTj/Fjkpt4ae2PSRMPIXMFG5Ibkk= X-Gm-Gg: AeBDieu1V5wFRYb/hB39x+a2Nx6kwLU+poW+M8D57UuAO41HcdFNbBLQpJVI/UhoVx4 b5uKAnXZHNuWERQP5yj7g5u3F+jeNvubouV0TeQkMBqQZzUvGFx+flWO+qOzaB8B44QHS9FqA8u Lb8hiI8ZQsXTYXSUC4N+Q4oa416BZKWQ619bqwSAeWAEhSK8N/aQpo3cLrp/b9ibXzY/WbrXMDd pYLpnjU9wp5gimCLWFTvOvDRpn4g8Oaw+LHcawLBkrnY9sX+TxkyYNIuaiwLy0umRtq9uSakq5/ jCyAXgkVxe+3WMUUujttWBe3FHw8EZP9NIv6Makl4dD0UxbN3swwcQfqjvX1JBt2j41FppHgwXn uLuBVbKvZFpgZJgniC9Rm3+Tb3Xo1FQt2C7sfsMNhHrkxkDRKLpezUFJboA7Xa6E1TNjZb1csC9 f58FA= X-Received: by 2002:a05:600c:8709:b0:488:945a:ed63 with SMTP id 5b1f17b1804b1-488d6655adfmr318872155e9.0.1776291832950; Wed, 15 Apr 2026 15:23:52 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43ead402ee8sm8339591f8f.37.2026.04.15.15.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 15:23:52 -0700 (PDT) From: Tristan Madani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] wifi: ath6kl: fix OOB read from firmware num_msg in TX complete handler Date: Wed, 15 Apr 2026 22:23:49 +0000 Message-ID: <20260415222349.1541181-4-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260415222349.1541181-1-tristmd@gmail.com> References: <20260415222349.1541181-1-tristmd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Tristan Madani The firmware-controlled num_msg field (u8, 0-255) drives the loop in ath6kl_wmi_tx_complete_event_rx() without validation against the buffer length. This allows out-of-bounds reads of up to 1020 bytes past the WMI event buffer when the firmware sends an inflated num_msg. Add a check that the buffer is large enough to hold num_msg entries. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Signed-off-by: Tristan Madani --- drivers/net/wireless/ath/ath6kl/wmi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/a= th/ath6kl/wmi.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -485,6 +485,12 @@ static int ath6kl_wmi_tx_complete_event_rx(u8 *datap, = int len) evt =3D (struct wmi_tx_complete_event *) datap; + if (len < sizeof(*evt) || + len < sizeof(*evt) + evt->num_msg * sizeof(struct tx_complete_msg_v1)= ) { + ath6kl_dbg(ATH6KL_DBG_WMI, "tx complete: invalid len %d for %u msgs\n", + len, evt->num_msg); + return -EINVAL; + } ath6kl_dbg(ATH6KL_DBG_WMI, "comp: %d %d %d\n", evt->num_msg, evt->msg_len, evt->msg_type);