From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) (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 9FB7E393DDC for ; Mon, 6 Apr 2026 18:44:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775501095; cv=none; b=sTsQGRwrxhFgVkI7NjiD65YpmcaS2A150LL5wRZCWfIvXGTjbeLgA/OKBDdcavHZkyMtFftV/igSW9gtNYUZJPd0QExGrnWFjnNNrC5MYkcqRsie2V4MwrUn82bRRd+ZUko5nyu/jlsbwfaPJannA05myZjWN5iuY9W1bG8VOtY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775501095; c=relaxed/simple; bh=pEvU+QYTdAtxGpbqErFvleuuq2RzHaUh40Ae5euTQOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hfATp3Wi3Ll8poYi7ujYBQ8uGfACqGdU6HbnQM6/wX4lMOx/pzsGHIr9WTwcfJ1z44X0OlhTECNjUoV1tFUc7bbgtXHXzV9mdc1t3/DKinZ5wGZS5QBYasBJ90l8ujV0uJ0oXkhdtMKqMHwu4vj+0EJlNKnlDz7frycww/enrLs= 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=kvyjnwoZ; arc=none smtp.client-ip=209.85.128.179 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="kvyjnwoZ" Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-79ea87af213so75958257b3.0 for ; Mon, 06 Apr 2026 11:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775501092; x=1776105892; 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=NQoz1d8ovhjDJHF4BWKEq+W4S1EYJTMp42UIwuuSZLQ=; b=kvyjnwoZGoxAq1ocHumgip16t+Em4S7Agp2d7+5B8P9LqhL4jagYmjwb8jK2JMvHoj illfD5+48JW4aT+SIs0tEnmRp/OWSR0EuWs/CfewCAZVO0/AMBpDO6rdX8I+gBrMTMWS Xw0h4xBKLxdTu55QEqrj9u79kt1ovT0JC+fytT6RKxIsqL+gVj8lx0Q87CP7FF0FJk7I P8cTvRKwoTE6g2392uA+S55X7pBPrf0pyVQYyctjKTZ5UjcBQCOonYUlCF2Nb2dF/vDM SOEUWYPaEVH62SucDNdB6lfgYJChDvwAa9qgTVlt03jKJmm9jotqwmqZjCr9Xm03MEpD lyOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775501092; x=1776105892; 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=NQoz1d8ovhjDJHF4BWKEq+W4S1EYJTMp42UIwuuSZLQ=; b=Yg+8RFUZfLmb3dw3DnYmgZ5Y8guh0D8Kf63gnjQmjIslWzBmSMJYFXoz8mKHailpyD selVWjV55yACl3gfS+5wEIu49KQBzR23wbjS0rGlstfVSBOtNhpON17eR7OItcqxv0K/ vmdh2RU/K9aTTlvWIJSd4eyh/2LsK1DqflTh2enMM/YPjmmefA7UqBtUkYGK1HGpWf7x Vq4VltjBbNak8AVoL+Dzkyt7hEY1B07OIYtFGDusMGjT0Rd2tLMnUN7WPEZA+qwYItAN BLsLiBge/5aDVJJ3/NxwRkMp2RZvh/o0gXMyUGgX2A1ZzIDSifPSSkkojXI7lHRwH0jc M5cQ== X-Forwarded-Encrypted: i=1; AJvYcCUNYy4M1pwV6hEIKvZMT1hhfUKEcp2UvkoBJSD4vdnvgZ/Y9k9OV01NUW2/jQzvawDWm5zOKBGo4kbru/ltMg==@vger.kernel.org X-Gm-Message-State: AOJu0YzkKqmGFAptdwPxGFbaWZi6OpcRevPwdaGH54sWBW7EXXBCEjLf n+cgmJscwDXkpYff+kVzjAsVlsLMe7i79/tcqe2cIQ7Fwo6+kSVNQnFn X-Gm-Gg: AeBDietDgrPLt2Yg2cpfszrwOnsLq/i8m6itPRkAXhO+ryamB2xLBsXpujW3ywpSAYm yyt6vAXC6uD8XnmKrTBWiWqTcFlb1Nr0sKL410oTlQMJzFDzVzLGwQH5dKzNDeLSaBdxMrPoJPQ xKvSV9oQ58L3/+raeVpLUlh7mh6NeAj71t09ZNOCZvzSDY/0Pxtz9BGcd8odBgm3L3B6aYN0Wjs jBUhrMxYlFVCd2DtMv3jGzM2ySiKhWhewI9feerLgKNcoVUeku0E1oYjaoJlvCj6kGgsQ52Jxlo P37zQccK6RJ0KDap3J+BNNuqxYOzBuC+4SYpuaO+HwAtlPdGWjPJ8xbXXOZQkz3nkfV1tEqiJAN oM1TbYkwwsnFbA/c99LKRfsGgQorE2GyYFqntNMH+ez3kAaAjlChr/WZYEs6vuwZz0aJiAHhmJR f7Bkg86cgrvNdH4QxkdMD4PWVNtTUCAPufMSPXAgrQVi58AGlCm/fLyJOhOAk2 X-Received: by 2002:a05:690e:440c:b0:650:3363:ff81 with SMTP id 956f58d0204a3-65047fc62edmr5918011d50.4.1775501091704; Mon, 06 Apr 2026 11:44:51 -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 956f58d0204a3-6503a9a9271sm6342830d50.15.2026.04.06.11.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 11:44:51 -0700 (PDT) From: Joshua Klinesmith To: nbd@nbd.name, lorenzo@kernel.org, ryder.lee@mediatek.com Cc: shayne.chen@mediatek.com, sean.wang@mediatek.com, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Joshua Klinesmith , stable@vger.kernel.org Subject: [PATCH 2/2] wifi: mt76: mt7996: validate WCID index before WTBL lookup Date: Mon, 6 Apr 2026 14:44:06 -0400 Message-ID: <20260406184406.8152-3-joshuaklinesmith@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260406184406.8152-1-joshuaklinesmith@gmail.com> References: <20260406184406.8152-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. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c index e2a83da3a09c..ea775029125d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c @@ -1327,6 +1327,9 @@ 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)) + goto next; + wcid = mt76_wcid_ptr(dev, idx); sta = wcid_to_sta(wcid); if (!sta) { @@ -1563,6 +1566,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