From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f54.google.com (mail-yx1-f54.google.com [74.125.224.54]) (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 F2A6F24E4C4 for ; Tue, 7 Apr 2026 05:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775540353; cv=none; b=KbbNRhR3uobvH3QtwqrUmyK265chfSjR+EIi/Vyh0XRttm1q4xB5mtnXuIyrmQW8ktYe1wX2L064rg/bbelJ8Oqgkpj2Z+Yyc90fnO5FDweT6meA+Y3F3ha3AO+R6VscVk1YmGLPcEoQAt0FpoxY6itBFegFdXWF4vZ8hlUsLSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775540353; c=relaxed/simple; bh=lpS2lgLycURCmZI/HtqHD/uyM5+gjDHHrpf13HFq4+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NuQ6iI8GpucABOhSnSwLL0cJVRdKNmlq6+oxpOW0EGopQqOQFvgQjHjeNrnrQYix5pX80Voywl3q5PiCD1hT9ctLb7WVXz3KP+Cb5JEM25kLA/q+87W3+FtlVfKZqS1Z/yG0VjuLZ8l/Wv82J39muId13AwRJgGKP7CWghcbrUY= 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=WRT1/Dow; arc=none smtp.client-ip=74.125.224.54 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="WRT1/Dow" Received: by mail-yx1-f54.google.com with SMTP id 956f58d0204a3-6501d242e3fso4438409d50.0 for ; Mon, 06 Apr 2026 22:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775540351; x=1776145151; 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=JyxNPR9LtOJbsDYiRzlbjZmq0oJ2BdijH6S9Tp9A2kI=; b=WRT1/Dowq5rypDOe3uHDJy5T/YZde5DYG+KT15Wbr3sSpvSGYeMP3Q+k4MQ1kvBhya ENdkTi6cYa76Cz0nJ3xS+5EmsUtETkLY/4A7+gKoR9aXacfoDCqf0Yb5/0a4Rle7m3Uk 7zS9akXEb131Zpmwk8/CoUnXKttPXLc5dEFgB9+QZrEteTnkq7AmX1JaIdAlarmPcBId R0HHntF94WjOaOTLtb62p5pmIPcG0PsHcv4JbcvckteXkGI7enWkZaZwAdi8+3iwV6OK pvHPFR2WBTZIAkUHUsw/6jwDyTnlL4/m13XltooI0LjjRsgujAGVXKXicYEdP7L0KYi7 Jixg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775540351; x=1776145151; 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=JyxNPR9LtOJbsDYiRzlbjZmq0oJ2BdijH6S9Tp9A2kI=; b=bUDrArh3/A/c0jUnyu3rkn5gBkIp5p6nCqJsuGHQj88JWk8y51lLAt6NvMQweZcj9f N7S+FF+AOIMYBnPZQlKdy8O5RPmA4/4l80FGBkWnPmhqU9LJntFcl9Y5aaOdOqsE43to hiGydOBc+w262O3iiUudoXeG0lcleO7Xu29CtsqDddNBEazdTqVn0H3xDQ7c6X+oWlra MgpGvg6ECvijgcQdZh/VwIJkqZElgwCjOQzBdjUC/Tk9yuZJm4HevqtUbrXyEFz2XwTJ lxr08okYf4KHV6EocYPRvutPxEy+TeUpqTq1mFt+3JDL5dOazhTq/Auy0FHzfb3PVOC/ pfAQ== X-Gm-Message-State: AOJu0YyatKsp9uv0nPd7TwKrD5ZvwaxHS3bMP21LgqexIPhYJ+HjI1Qb WE8jQY3LDKIH/KV6MRjBMUQ9++2SPdQUUy25qTTQzBPwZOv1Ol1Ce0yA+xQS63WR X-Gm-Gg: AeBDieulrON9ZL3wTiqeI+8AnAtBZQ/zgCbjkPs/7bQ/VB/2mIXmQ4qdYSUakM7+jP9 y+w7+OdBt4zC0xBmVoKbMawoV3NJdEjhXcFtc+Pf3ic1Ydv7ekZNr0WVlLDJlq1m77vgESe5OWe rKltR1b7bHWFahwVCxC+f1Ne9v3nVpVBINUWpOgfZH9LvDORp+SPwBH7fPp6lzzQbkLHGA0qQzh Oue67gvhnHmocRXfP1q4PBQumlWwF8jtdVvzpMmigxC6HZaMoOi99wvqlqgcHd6Uj9az71OAj5U UBMboX9paJA+2gdH/aNO1F0lI2xXXqN00QSM0MuJjgeTqJ0LZNK0thOvnjF7rkI775S6W5S8HOW gNePoOGnsI5BO5aMLUlymaPWMZlFILqPiStW56HND816pFhdmrUK84cSKoALeC3mIBGGl3CiwDJ 28yaWbgqBO9z1yZwTDLNojSYfSqbNJasJMR0ai/kp8/HUY6soCftc1ZxLZLyCR X-Received: by 2002:a05:690c:6d81:b0:79f:5ce4:d68a with SMTP id 00721157ae682-7a4d00cf688mr149319447b3.0.1775540350873; Mon, 06 Apr 2026 22:39:10 -0700 (PDT) Received: from DEV.lan (c-75-74-152-49.hsd1.fl.comcast.net. [75.74.152.49]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7a370df16aasm62717857b3.40.2026.04.06.22.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 22:39:10 -0700 (PDT) From: Joshua Klinesmith To: linux-wireless@vger.kernel.org Cc: nbd@nbd.name, lorenzo@kernel.org, ryder.lee@mediatek.com, shayne.chen@mediatek.com, sean.wang@mediatek.com, Joshua Klinesmith , stable@vger.kernel.org Subject: [PATCH wireless v2 2/2] wifi: mt76: mt7996: validate WCID index before WTBL lookup Date: Tue, 7 Apr 2026 01:39:03 -0400 Message-ID: <20260407053903.75861-3-joshuaklinesmith@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260407053903.75861-1-joshuaklinesmith@gmail.com> References: <20260407053903.75861-1-joshuaklinesmith@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Same class of bug as mt7915: the mt7996 driver does not validate WCID indices from TX free events or TX status reports before WTBL lookups. An out-of-range WCID causes invalid MMIO accesses leading to a kernel data abort. Add bounds checks in mt7996_mac_tx_free() and mt7996_mac_add_txs() to match the pattern used by mt7615, mt7921, and mt7925 drivers. Additionally, clear the carried wcid and link_sta state when a WCID pair lookup fails (either out of range or not a station), so that subsequent header and MSDU entries in the same TX free event do not attribute statistics or free tokens against a stale WCID from a previous pair. Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") Cc: stable@vger.kernel.org Signed-off-by: Joshua Klinesmith --- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c index 3d9648fb6773..f962ad398e04 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c @@ -1248,9 +1248,16 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) u16 idx; idx = FIELD_GET(MT_TXFREE_INFO_WLAN_ID, info); + if (idx >= mt7996_wtbl_size(dev)) { + wcid = NULL; + link_sta = NULL; + goto next; + } + wcid = mt76_wcid_ptr(dev, idx); sta = wcid_to_sta(wcid); if (!sta) { + wcid = NULL; link_sta = NULL; goto next; } @@ -1482,6 +1489,9 @@ static void mt7996_mac_add_txs(struct mt7996_dev *dev, void *data) u8 pid; wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID); + if (wcidx >= mt7996_wtbl_size(dev)) + return; + pid = le32_get_bits(txs_data[3], MT_TXS3_PID); if (pid < MT_PACKET_ID_NO_SKB) -- 2.43.0