From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 68BBF1A9FAF for ; Thu, 2 Jul 2026 00:50:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782953425; cv=none; b=L+nhxPJ0h56CIkNzRw8UFYWhjCJglgwHgdQUoAWGR7jF++A8i6lP7TTaIfqaVmmlrtHnpwHUZHs1VDARogklyDfOupxssILkVkoh2gYRnq/YyzYf55e4nKFMfjTdqbBWrhAaYp7fHnMyoYsPHvV0D8Bwiz5Y5HpqjNVx8FR0z1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782953425; c=relaxed/simple; bh=oAV3PO9BQ+ZuyovnCrvkgJTGceWcDv9CRAo4iAZ12p4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=arsdaGB9kEvKsbUu4gGQawUsvXzFXLJlwF/ouTY+KYHNPicS1tIsLTfiR+9Tet1/vIA/2Ct2hpLYEmaySbVnAVzyJHdcxS/gFbWo8UDdvXgIR0yBbtdFWIX4Mi5wasquuk+R7t0pZwMzdbHnJb91lmjTSjzRfUoGcSTC8BZz3hM= 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=T0qW8dek; arc=none smtp.client-ip=209.85.221.44 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="T0qW8dek" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-47231f1f8f3so1465869f8f.1 for ; Wed, 01 Jul 2026 17:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782953422; x=1783558222; 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:content-type; bh=CWkUSJ2157Xsff0+/g2CHpj4cXQ6nQx4HiCWFbqWFso=; b=T0qW8dekdGH0/URnE6qqg0dAY4aUECbNrYbMHqPJlPoAGcNi/n930ocAnIkqUKy+wo lSP9RyayirXAzHruU2CFrLofdrB9OUGNtLYDgNn4tXYKGpMrsnYoAHMOwb50W+XN1ti3 nWnYuuHnztHbyjUREXTwVFeP1pdh/18JW5ulFoLAKFlzsZF37RGb+D1EIaBPJ68re4jR ONTwIc4qvJxkT8BOa1ZqVQxSsCqaI/5uvsyrSL70gHRDkUn47xkY7TXSVz8TtYZfl8XV RzFX69sPh5AdJiInWcUuxHVp2YKDjRu2shAHpyBpLsGQwv5z63Q0pQT9OB5PuPzc/Ao7 yeMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782953422; x=1783558222; 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:content-type; bh=CWkUSJ2157Xsff0+/g2CHpj4cXQ6nQx4HiCWFbqWFso=; b=sJkYpjnExSgVxSGNJYLKXQX2/Y7hWZUAncDasKhaAbDelIcPz0cozVFZoUPLWm3SGZ fXVldTh6ZKBhkV+fbhuFW4SRMI+s5Tgcnxeh9eAQYdRzeLYbimHaOpbFoaQqXI+U6hTw qNMblYS/rwgLun49yjXE6aoR/tjhADZk+i4mf4E2KQWKjHekXIKruo9XrF3djYblpIlC 9fWIw8Glph6S/lfiK54WqiLkE3dTSs9w1HJ8+RC7rZOeh647DQuBZQgMsrkMbjMkYjBP vaxg2sI7W602BiMYeFUHWxbyJrEM/S4sL8QLYWXMpViNLoi4sW0zqqtI7KaPHR5vaI46 rukg== X-Forwarded-Encrypted: i=1; AHgh+RpRVCMYPQH9VyeEdR1L+AoP4+KXxtCsAeOIUMXUSjz0Is/Y2PN7HoS6JQnOTROE8sXYXIwwvx2v899G0Vc=@vger.kernel.org X-Gm-Message-State: AOJu0YzFQjSuZx5o9Oi1MohQuwQ27oeWBJA4BKpgn7+gku0pdfifqQaQ HebXox2Nv2f3UaUFLRRj1G1jh3I61OBnaULm2aIGP8Ef0fk4cuXYJVw= X-Gm-Gg: AfdE7cmlDr/cHtM+CwGj1t8OupnhGnQV8vn7kH4XehCbZ3CTUxnuk5rvpHy4ljRLvPN 3tPESwKVS516FpBtGw4ApKH61hXt0hY8FULM643qef8sPFmOSLHBysSrQYqm9CaIf2B/V3wObjs FNRUAQ1yxThU9z0kjjrSFLw88OmnwipTnpa3LNI+tSmKhCyKfnyVFukrGI8AMPED9PU0ph01ohc Ue0ncMuWIWUn6seJ/pbOw3DX+Ak1c4S8MXPE43g9CzpW+lBKswqGzLg0OqBHP74JmW2s2VU/33l slDRUA3WtSK0+M8rylOW6jBdLSVp7R6yHW4+5Fyu1QmLL21lPbmrD47+ZssYW+D3Kvl6okGqveP /QL6FXAh6M4oOLjQC0FvI1nHDeY5J1c5sPpmoMWb/QFYwIW66kBAuSY0W1A== X-Received: by 2002:a5d:5588:0:b0:475:f100:35f5 with SMTP id ffacd0b85a97d-477b5c415a8mr3398042f8f.50.1782953421736; Wed, 01 Jul 2026 17:50:21 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db8a4b83sm4747406f8f.12.2026.07.01.17.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 17:50:20 -0700 (PDT) From: Tristan Madani To: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vasanthakumar.thiagarajan@oss.qualcomm.com, jeff.johnson@oss.qualcomm.com, johannes@sipsolutions.net, tristan@talencesecurity.com, Tristan Madani , stable@vger.kernel.org Subject: [PATCH v5] wifi: ath6kl: fix OOB access from firmware ADDBA window size Date: Thu, 2 Jul 2026 00:50:20 +0000 Message-ID: <20260702005020.708717-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 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 out-of-bounds access. Clean up any previously active aggregation session for the TID first, then return early when win_sz is out of the valid range, instead of proceeding with a broken allocation size. Fixes: bdcd81707973 ("Add ath6kl cleaned up driver") Cc: stable@vger.kernel.org Reviewed-by: Vasanthakumar Thiagarajan Signed-off-by: Tristan Madani --- Changes in v5: - Add From: tag in the patch body to fix the From/Signed-off-by address mismatch (Jeff Johnson). - Drop Suggested-by, add Reviewed-by (Vasanthakumar Thiagarajan). Changes in v4: - Move aggregation session cleanup before the window size check so that a previously active session is always torn down, even when the firmware sends an ADDBA event with an out-of-range window size (Vasanthakumar Thiagarajan). 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index 80e66ac..a39c815 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -1722,13 +1722,15 @@ void aggr_recv_addba_req_evt(struct ath6kl_vif *vif, u8 tid_mux, u16 seq_no, rxtid = &aggr_conn->rx_tid[tid]; - 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); - if (rxtid->aggr) aggr_delete_tid_state(aggr_conn, tid); + 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; + } + rxtid->seq_next = seq_no; hold_q_size = TID_WINDOW_SZ(win_sz) * sizeof(struct skb_hold_q); rxtid->hold_q = kzalloc(hold_q_size, GFP_KERNEL); -- 2.47.3