From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/ath/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, ev = (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 == AP_NETWORK) { /* AP mode start/STA connected event */ struct net_device *dev = vif->ndev; -- 2.47.3