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