From nobody Wed Jun 17 01:50:47 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.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 878F43D16FD for ; Tue, 21 Apr 2026 13:50:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779415; cv=none; b=ot/KSvQUOBe0XYbjxsvoPypIwee/pq/V2PDWR64pibdbFyh1MulayDgPU8hZVnklTJOnNn4EPDtXf9fzAFsnk4RbYZh38Bm/36lCfqXApVKiqEMjJQnidvB7e3mVPptBGi2ApdmIfbHOPaD0rAyb3rrybBNdqvV5OTIBX2uUqio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779415; c=relaxed/simple; bh=7xHdMKpkxXstirzQNsKPmRsSC1m6fp9kR0giIOUpbKQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ApC+kv4SCALn6DUWSEScVnlUel92YOQsLcCYP6Ac7OacGWRINmf5LvKQcLF2dONjLSVr5CclNNRbJepNRkK5UDJQzDE5Sjq/6FzZS72ST9Dc/v76ZLvS6B2dwY87KrvHOmLwZqWLwuQExGpgDhhMuAPN+Fgxu/FaLIrPUDeO+bA= 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=PsWrkNqx; arc=none smtp.client-ip=209.85.128.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="PsWrkNqx" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so6800945e9.0 for ; Tue, 21 Apr 2026 06:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776779412; x=1777384212; 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=TVTTdLSY03WpD7raO4AFtimw/W+4ZUAurUEteTPSXv4=; b=PsWrkNqxekPgOeI45DvlfYrNftfX4DEaAs9pUiZ38q13o2wxRTH+55iEJmh3Dfzhrm COgo327eI1T0OHeI6f7GsccfCTYLm4XtPYGUYpyaHn9X4QF5X9WSwMEGcE7Tb4RLg+j8 qKxdAou4tMWZPEt32gyxVP8G536nzAOC9g5ec18JoCX+KtVZd2IB/mMM1lYNh/4LRV9V eRSSpmzYAVWSVJW9QqB1uS7MHTOLORikrXvlKX63VII5Yv+j2iR3XP1PfrTYQVao7axC Nhm0juDhOt446KppNAguQA8VzdTFQ8tzCL6w1w0vf7MiyQqhqFnx52J26x/bvOzdeCv9 9mfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776779412; x=1777384212; 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=TVTTdLSY03WpD7raO4AFtimw/W+4ZUAurUEteTPSXv4=; b=VXIGxwHUFIeOX/38B3KKx2ItVGlxUS13p+nmYLco65DFDjqL78kSAintvgaLrz6oza BJqoHF62Z74c1jVEKlfzB5CFfZiRQ9Ha/35qEbbFewfikUlJHcTnL0TPoAWUF/nZL7g+ 197y6ndH/WoJpNtHXETFzqqcPLs8cl56JEYNjSgEmttdCbB0Dh0h491rhGAJ67WB8T9h X/Ni7qSBCh30xGPfuIUTFmQa+mtgF32w6tJu+33Toxq/P8Em73JrVijRUKpB9fwo/RbN almL81clCvPRuLe/wuiKJspg6S9RbYbQka3NUBr6lSVWA8aD0VUDZaLh/m1BiEMHYksU wz2w== X-Forwarded-Encrypted: i=1; AFNElJ8lbcY/iMmRwmRMGwmOCscyYkRm+u3TKzybl33wVw4Z7OeGBUEpi5OYmTK5UEq0Ix/URarZV3B9FqFeV8Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3gAuxyRdk/UdyEKn1t50E4NWJj3k9arxJ9NWIPnuVzCqdPGiT Ny7oqv7A4B1XRC32eDB1MLdpbLt/AbEIepk9HpTSexTZhKPv+rkE+uk= X-Gm-Gg: AeBDiev1k8cMtRjVg6h2mJ7kREHQlBf59wzLHTKhRvkvzrcaaGCNK1gijkyvcxHCiiT IkKJAzX+FqTZD+qTxg9pRU9XYM9fK6A8lycOwbzpWLxteq8RT22bP+InxLxVEFnRN+Vn/muJfLm bOCqdQFFOECglHxQx2m26b9aPtijCuajuQ9v4RwqIDN/zGD5gp07uKLDr5idbfXb9Kf1VMZyPuA +JAyK6P09O1ewz5vuLym7FHhwI9DaDa5MT9VZdCLF8BdWN9y6Min97G4pyr2n90oZSJAPttfJ2e w1kKVo0eOWEoZ1j2vGpEswVoFy4M0VkKngxnQsKTTLMRcnnwRWbKj3wps9V5fbHfO3neWXVeMKq Nq0hZZrIuR+uuGeizHlC9LW87plW+SEUR3t/kNkPe/dOWLcqGW0BO+e0Lqe8alToSK47QWbPAG4 0jZGI= X-Received: by 2002:a05:600c:888b:b0:488:c40b:c8bf with SMTP id 5b1f17b1804b1-488fb73d234mr214825115e9.2.1776779411691; Tue, 21 Apr 2026 06:50:11 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fb74eed9sm165464395e9.1.2026.04.21.06.50.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 06:50:11 -0700 (PDT) From: Tristan Madani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani Subject: [PATCH v3 1/3] wifi: ath6kl: fix OOB access from firmware ADDBA window size Date: Tue, 21 Apr 2026 13:50:07 +0000 Message-ID: <20260421135009.348084-2-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260421135009.348084-1-tristmd@gmail.com> References: <20260421135009.348084-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 --- Changes in v3: - Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines). Changes in v2: - No code changes from v1. drivers/net/wireless/ath/ath6kl/txrx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/= ath/ath6kl/txrx.c index 97fdac7237e26..5575b535f94cd 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -1723,9 +1723,11 @@ void aggr_recv_addba_req_evt(struct ath6kl_vif *vif,= u8 tid_mux, u16 seq_no, =20 rxtid =3D &aggr_conn->rx_tid[tid]; =20 - 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; + } =20 if (rxtid->aggr) aggr_delete_tid_state(aggr_conn, tid); --=20 2.47.3 From nobody Wed Jun 17 01:50:47 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 4A98B3D7D8D for ; Tue, 21 Apr 2026 13:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779415; cv=none; b=o98DFk9Ldg56gnetdl5pEpLD9c31fxgOv0SYs6c5CFdlYg1ybf9UWAsz+m/AxbbLtgX0U10r2Vc8sYdlZx8GgL/nRta5jX2Kq79cH/r9/P/1quaCHmHa2r8DF/+jNiNhC9rNIySMfaVmES4Nmj/s1U6wlZ+7Ase2I8UqzXdwaNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779415; c=relaxed/simple; bh=nMUZwV82/EWWFA9HBonHFD9Jw3tw62gHhXKeiT4HTto=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=inX9074sBfSvJygAETCJHrmz8mOL2Gozjb8p/a/Ff0IdxYOPOS0UxqZM0W8zfSGr3dV0VvSIFBc1Irj4DY17vY5GytzyUleBHFb6CrBhzi8ZqMTWvN1SrstWzIh3TLl97bi2dsL/oyiQ6C9FxESFfDYinKv4+iikmqGG0dPCBA0= 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=UVnNU5IT; arc=none smtp.client-ip=209.85.128.46 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="UVnNU5IT" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4891d7164ddso14332385e9.3 for ; Tue, 21 Apr 2026 06:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776779413; x=1777384213; 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=475Ox04YxLiQ4k0uuKR/VNnFlbj2LkbXJRmAcU4HIyE=; b=UVnNU5ITB27/hWt+gEeUAmcQrNFzEF1SlfsFzNojG50QK7ZoAK4az7N7yTQd43U2SC goSRxwOGUcBT4Yf09a3CeE5VQCf+lVCp6aiQRA1cxFwefCTHXE2I0RYkaBQFPpoaTghJ tkVwygNgH303k8mJt34cXtsc6zBer+7wCN8TjCoZ63xWREOHQJPmGogd/AqwUCXq8OyN GIIUKz9xqwRlzWkwyDor/ouJh/IQcaRtJAOniUeX3uovPZX2252u7J7kUeqxNaDqDSWV B1lmijqfuTJtZe/B1jQoRwiQUWLVvsFEU8/VeU7J3WtvheRklGfuSyCVM0IWqLok0et8 wc8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776779413; x=1777384213; 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=475Ox04YxLiQ4k0uuKR/VNnFlbj2LkbXJRmAcU4HIyE=; b=QW3Ze4sisJsaOsl3QBrWyLkUEhJ2Gfd/CbcpcXSkF8ZFx0N1ILStz9x+Eao4RUUMjH vNBMNicBfnBcvaZSGQw+b9na2/5Af0HbGDtvd8lDtngrG1x2gz7Sgp8ym1vo7z+PObbx pO4GktXgszmp0kqkiymm+0EaVeynYhqezEbSBYG7/WTpIa6JnCfU7grm3fzB9GlhRVYp b8T1mFzGqJ4ZHH315+IyA2a0DrDq477Xhgc3U7x9+1HPhWRRr/8wjZTNbJg30VXi/oWh zri+CXuAS9iZJ7C5jfOteIJk4uYktZoGMPejftxZ+NmJHCWrZ87UWX619M8rnKJlM1aI m2Jg== X-Forwarded-Encrypted: i=1; AFNElJ8BLR+vS4PKv9BpLYENodPh2plmQITwTuatxdEOPjpfIqqCuiof4FUe/RXjluUxtTNouo/lMOlZlo40zyg=@vger.kernel.org X-Gm-Message-State: AOJu0YxBZGa/2JLXT34Ta8satC9JT38MDU7GEcNCZJ4Ik3aizSgX9Ybo hWWu14Ei+tyCtVDcOaYq7GlPEJFEtfwU6ssa4+X93SqmwvLwfYkCif8= X-Gm-Gg: AeBDietsQFJDDbRM+/0UmgnKdDsiwbOGLnOtLnKjmSgx2h70zlGcc2qcKgLUzEX3sBT Bb3jYR/ExlaQuaUSmOc9RRYfUUPK3dm5MTCwGaLQ2EAeNuZPez1o6ChJKfwc/DwbNp8Dff8gfRh PUxtb0S003uNurYOUAhIi2P6ZaO3HH/N6+PW5oX57I9HxGrsWrP2FVl9Zt7rU6E4w4cxQAm8KSr uCd7lbyBQ1YeKMR6kJufu2yVqeBAgPfQ1ngiXhqD/syWnCX8TsLLFoSYvPUkkZ7fYx/9HFWzF7c I8Nny88lULaC/cnwaytJi3q7qCS+2sCrh6+c7X0+Ev22L/RecqkmgefTqlvF868dC2+L2q3OUGc KbUY0AHURooW4AHSCU4Gk9S1lDAZf3+VIqActh0CwRJeUKnM/gfTPY+OPe20GYIjfDDOv7u1X5g ujDnw= X-Received: by 2002:a05:600c:3150:b0:485:3b00:f93b with SMTP id 5b1f17b1804b1-488fb79df09mr277879795e9.31.1776779412533; Tue, 21 Apr 2026 06:50:12 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fb74eed9sm165464395e9.1.2026.04.21.06.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 06:50:11 -0700 (PDT) From: Tristan Madani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani Subject: [PATCH v3 2/3] wifi: ath6kl: fix OOB read from firmware IE lengths in connect event Date: Tue, 21 Apr 2026 13:50:08 +0000 Message-ID: <20260421135009.348084-3-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260421135009.348084-1-tristmd@gmail.com> References: <20260421135009.348084-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 --- Changes in v3: - Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines). Changes in v2: - No code changes from v1. drivers/net/wireless/ath/ath6kl/wmi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/a= th/ath6kl/wmi.c index 72611a2ceb9d8..1cafbac2938fe 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -862,6 +862,14 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi= , u8 *datap, int len, =20 ev =3D (struct wmi_connect_event *) datap; =20 + 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; --=20 2.47.3 From nobody Wed Jun 17 01:50:47 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 1E8893D891B for ; Tue, 21 Apr 2026 13:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779416; cv=none; b=QFE1XO4B/qfsRc749nBRzep8SJsFZWgYt8VMZJfq8WiU1ijbeu3lDnibZ6di2TYJyJB6Iap0Eatju3lhjFBZL9qF4tmSCG6UkcPuSkVHhBmuXtNPnsP1+fYG90qZyQqQx0fcmDeHBmEztszgoMk5nGBVv7zd0ZQvqaN2WPSOaf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779416; c=relaxed/simple; bh=2H6hTDChOhJd681tRPs65IZJLGj7nl+VOPdTe2WBpD4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pAHwivatoG5udPp92URvc+gnblBbkzRmOxp5ojeIMyNpUe/V4LrErDlVd8Fiw7MMF59R7ZJBUST4CthplLeMVYiDEXqrNe3tAKdgM1MZDUyEL7/hMSAuNamM8x6icYbq3ZN96VL5m0C/z006nG7yAL2VxPR1yGqQYJTerzqdk0s= 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=bs8i07QZ; arc=none smtp.client-ip=209.85.128.43 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="bs8i07QZ" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso21780965e9.2 for ; Tue, 21 Apr 2026 06:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776779413; x=1777384213; 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=ANonBuUNxESIZLmfGSljrtPnkc+xjGhwtbNKPAr/9Es=; b=bs8i07QZvQWhTNwUa805r8RsA4UwxFFUPs06BpSzNOEOebyymi/TzpklBwRiJY0gkM HVefbOl7lbeFUu0UdtzhgvU6Ufhzfh5R+6HNpHl9QhDXI153Ld8LQig7T1lUy0i8mxth kOLYO29bMshZiTa1RC8MvCY8Y7EVg5xOhTknIkM4Fao3CmWWJWeDSp82HLegEOogD5L7 CFFzqoBFkDicShUwabFAq4PNcdAd7debCFzrYDKAJ34eBnZplkTtGogDwNhk+c59Ywln uHdzIdTGuW8hP2HLvaAZ2SbPD63hkczT2G2pO8ecjbNCHyTgsbprmX9wAw0Ccnnqh8c8 gbHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776779413; x=1777384213; 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=ANonBuUNxESIZLmfGSljrtPnkc+xjGhwtbNKPAr/9Es=; b=TriuWjFos96D7xFPhn0bzWt0uPJ2EVne8yZyPuSaowZ2C1gBoYikKtA5eWe2yVcMgX 9OytHzC4KLK/Ah8J8Z0sA68CzgsJEq2kWPaNG4zq3Jw7GESxKq7naeG6VHSuAeEVmMU6 zmmLibrk/NvLwWNpJgXQQhobWFUMMNRUaXb0t/7umEe6zt+0NDPjkrzJNhrkahOLDHkb t7bSJ5wM34z4hvJ65+hLM152ibjK0OSWsTEfP+2FjXvq16hfLWfMyh730pXGG7CF39E7 Bbmjo+mSZ74DTq8fcb6DYOnAcTmNRpmkqvmg0Mx60tm14AEuVwOh0f6MDK8gv2+dPQ1k R7wg== X-Forwarded-Encrypted: i=1; AFNElJ/NoHHmk4DlgNZRY+eAqaO8kKxwD6hMkmHPOKqD6Dv2gkJ0L5OtEBS9Bo2SnNsVcXX5lYY3NWQgEPT7y9I=@vger.kernel.org X-Gm-Message-State: AOJu0YxioG8MgljFNXmi9nilfBlYtu/KUXlHECKXqN4jRIpHo++DfPIe HatRRXJZ3CbkZM+G/VyHBIRcWswtMkYby06Rap4c5P/E1VYglFwuIc8= X-Gm-Gg: AeBDieuiWnV07aooYuusAyc3DXbIIvXXlBrHboQUG52mL68hpUDlHFQ783Y48cfrUrD 363eDBGNR7t0GpqvS6hEboowHRvdZ6UQ0IjzXkX2wmGgh5Toq4AsQdwJrshI//wy74RL1KmKzih GJYRHhllOWW6eAKGJAkvOCVtT186L8ZtxwQ1Zh7aA8y6ghw5FSoIPGFqtXwZo0KRX7AgsRSNd71 vhLXh42wIwB7newj1nHc1OAanYMqv0wYQOSyTJ06WuFgU8FaJvuSEb+Xa40EQmgRkLrIIp1RBWp XBNtJuA6y8EP8vUWS+iZNLy4FmLmDrTFknhm79tgsUO6vVIYsUK/6DLLHQP90WMwVwM0k/tlPFP V5I4vO9YnVHYQldIlFwifIz78phZEMsMDk9svSQD90LRo90iObMh6MVbPHTo/N3Y/2IZFshtq7X ffbLo= X-Received: by 2002:a05:600c:a314:b0:48a:58aa:523 with SMTP id 5b1f17b1804b1-48a58aa059emr10285065e9.31.1776779413289; Tue, 21 Apr 2026 06:50:13 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fb74eed9sm165464395e9.1.2026.04.21.06.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 06:50:12 -0700 (PDT) From: Tristan Madani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani Subject: [PATCH v3 3/3] wifi: ath6kl: fix OOB read from firmware num_msg in TX complete handler Date: Tue, 21 Apr 2026 13:50:09 +0000 Message-ID: <20260421135009.348084-4-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260421135009.348084-1-tristmd@gmail.com> References: <20260421135009.348084-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 --- Changes in v3: - Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines). Changes in v2: - No code changes from v1. 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 1cafbac2938fe..f56722c5ef5f1 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -484,6 +484,12 @@ static int ath6kl_wmi_tx_complete_event_rx(u8 *datap, = int len) =20 evt =3D (struct wmi_tx_complete_event *) datap; =20 + 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); =20 --=20 2.47.3