From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 346331C2324 for ; Thu, 25 Jun 2026 23:29:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782430153; cv=none; b=uxpRNw90J4qLJjBnk31CseYNzEAkTFXlfOk8Fg7L2RtkEEu3iMtwrkNm1/GjhAiF+3/Ds9/cXkk9a+h6JK87Ul52C45T9h+RHdSleskRPP22PN6HpvmzFplJb/eVVNGL8XwcZxKsbh8/a5Ps9p8Sdx+P8AJ6wwJ42Np5HQkb/2Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782430153; c=relaxed/simple; bh=gCg2vd6g9pefNkyTM8ycUQ29luRddCdHcfx3HAGIBTA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GxTUPcR7XfRuWM7ZVxZWamBbpDaoMwIo24kI1PSh+gSoTciXONLijsbpf4VPDjcyahc2qJNLi9OrtsWmtHvJspx7jxmK4JHZetlgc3N/CXVKCI9irOB8L7tRXpYKVzV1ytdgnBFvOJWmbqhmILqKk/8X4zeLN4ZHefGal93q/w4= 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=TaNTvXWl; arc=none smtp.client-ip=209.85.128.47 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="TaNTvXWl" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4924944fe6bso2624565e9.0 for ; Thu, 25 Jun 2026 16:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782430150; x=1783034950; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VDZ01kcpbRXceh7FDGKsfrVh225rr07qMNEJSm9awTU=; b=TaNTvXWlAlGLm9rxa4nd9UQt+6AI/0x53GfZLqYJHacIPoQ5b4Nit1ps6VK7D3ptzV +tt6uvQeEEhqdaN+TKVAyzSJxrojyB/mpU1lPOpbd1eJsEUWzkpPMmZ2nco1E0+DBu9t YDZ+oGJ2bIudvW537O2CPnCfI+3+TiB9YmhXZQmosnPpmVU8rnNzAkk1zAtNCZbTAng4 yfX4Tfh8DhAF7IeGlz/ffOUl2HblCS+pvnlh9jf75uZoalBtjLEgp/0/ptUXqwluOZUw Y5va23s+wByGJfmm2DjxsOE5zp339LC12JQXSblGTGV9hhwcZdsTjt1vVOBdBuqjBeI7 SndA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782430150; x=1783034950; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VDZ01kcpbRXceh7FDGKsfrVh225rr07qMNEJSm9awTU=; b=LTq+kV6hlsi1jyKpwkC2hg1i7JLcq3HkB4eVBZrnoJwEtS88BoFyGfiaNTFZeJI+KT cyM05MEglDCY1NdReWfsRUVDMooBchubMBlx2/QMDILxA6GHeiujx673Jwvgn6/mtkrZ MZeuul/QB4QFjRH/baAjvYEX6xOAnQyhOz/y5ZcPcI9Js9FJZ8cc8WrqNDbYLLudErA1 57UfSiWQ8/kD+dYrWgmmlu9oYKFj31fe5wha1v4NjFIfGI2IXQ2B19eMKuXMli1FV9Gd OLWhoUX9Ee6cV5jBTeYzSF7Qxm3KasMW/fPp2iI76H5nKzXf7WFxiJlvgTV3YOlbj519 eU/A== X-Forwarded-Encrypted: i=1; AFNElJ96woSCHO/ip/zpR/4T+712lC1bgdD4W57AZKxgqkLvWfBFD2rO3qwdPnQu8tA4CVynRL6/Ex3ZiYZxdSU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxai6DGlEfe2aJyiFz8lSe9C1Q/Iz6iEqhTz6fhHAl0b7tbRmOs EN53v+k6OQGh+/hFCwuqFYxcL2gB2K1P3uK1l1cFdxLvx+QQUsrnKog= X-Gm-Gg: AfdE7clK2Mj6CpbO6k2b+wyxeWrsy3RHlZ/0NAOO2ETS3onsrA1MdGecjGWhJvhYKt8 HxAVUgY+0Aj57ycnOgjAAmNwcyrCjHw2jVTX27mNrrqOsG7TTWNLgp0KfaLltqu/g/M0qV2xmtL Mo6rZowFqNcaoCVp+kSS8DJfrnIgQXG2dYS6QqINI9OajUCKn+JRgSwELPs1241kPp5aMl/yqVy MXR7WzoM42dOD5ROOpdenafQai0oErYhSq3JkBzjtXiGDBsVW4SIXgPFbYGaEZEzY8DQ2/cD0ud UXNwdnxzdzSNLBv0uwOzIkKti0Z06+kjUxi7SjneFDOuCV9+pJ5pDfNWxFos3kbRBA5gxchOlro WuOys5fLX+LpdnsRvHPLKR625TKK4T+LfONG6VtbHtkB3eURp7o6+PU3gGg== X-Received: by 2002:a05:600d:6454:10b0:492:3071:1db7 with SMTP id 5b1f17b1804b1-4926689faa2mr51981055e9.28.1782430149449; Thu, 25 Jun 2026 16:29:09 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c1ee018e8sm21925173f8f.11.2026.06.25.16.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 16:29:08 -0700 (PDT) From: Tristan Madani To: Jeff Johnson , Kalle Valo Cc: Johannes Berg , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, tristan@talencesecurity.com Subject: [PATCH wireless v4 3/3] wifi: ath6kl: fix OOB read from firmware num_msg in TX complete handler Date: Thu, 25 Jun 2026 23:29:07 +0000 Message-ID: <20260625232907.3620746-1-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 the fixed struct and the num_msg variable-length entries. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Signed-off-by: Tristan Madani --- Changes in v4: - Split combined bounds check into two sequential checks to avoid overreading evt->num_msg in the error log when the buffer is too small for the fixed struct (Jeff Johnson). 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index 3787b9f..a572952 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -484,6 +484,18 @@ static int ath6kl_wmi_tx_complete_event_rx(u8 *datap, int len) evt = (struct wmi_tx_complete_event *) datap; + if (len < sizeof(*evt)) { + ath6kl_dbg(ATH6KL_DBG_WMI, "tx complete: invalid len %d\n", + len); + return -EINVAL; + } + + if (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); -- 2.47.3