From mboxrd@z Thu Jan 1 00:00:00 1970 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: 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 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/ath/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 = (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);