From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 788A04CE681; Wed, 30 Sep 2026 16:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784856; cv=none; b=VzVsncrsSQoPjI0UYPRLiRaG1B7dTxFSJOQAjb2bLWc4eohnwhdCih0XLyBM887dQlc8XycNe1FXBWSbnPRIEGwGGkdX5zVoLVXTS6S9uVGvNkope+uajy02P7LL37z0fCKdPaB0OHPvN4+DqT9T1HJyLsDN4HpT1Dro+l1+PTc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784856; c=relaxed/simple; bh=+z9pPmC4tEg3NaAO080iD1Rfw32p2NBzvBEQvZBj+xM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U/k7t1itHNJirdg6a8M++IJ8SjHWGQ62mzs9gD9sfs/sW20KqHHAXl3uHGyyunbYhHEl/kTnRX+m5c6CPMnTC4QrKr+NfGiaiv/5QBODVG1wfh8fRp4DEwwqSS+FvwScGwop5BRjektXHZgBrz9llFZC/8/bVMXfppdw8PwbJKM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cL05g113; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cL05g113" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D58E1F000FF; Wed, 30 Sep 2026 16:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790784850; bh=POzRV2+PQ6tnbeKHLKSLzGnoPIiwmHaqqpt11LUbO0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cL05g113+8oI11hfFpLwUQQnlb0m483xZMJ+NuOzYhAJs1xxcD12fQUX7vdAbPGqH PdlZYDNDFabv2Ucy5eCRZWbU41irJ3WSSs0a0euUjD/coe9Gxf/6Zw+Nkw233AYJjZ WdXFalPjwP1mSTV0xVdQYfEv6Myb5keLZ31LQxNU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikhail Gavrilov , Laxman Acharya Padhya , Junjie Cao , Linus Torvalds , Sasha Levin Subject: [PATCH 6.1 299/982] wifi: mt76: mt7921: skip unknown CLC firmware records Date: Wed, 30 Sep 2026 17:17:15 +0200 Message-ID: <20260930152423.229304706@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Laxman Acharya Padhya [ Upstream commit 1a296bfd3e775e515233f746218824fc7dd5ff16 ] Treat an out-of-range CLC index as newer firmware rather than a malformed image. linux-firmware 20260810 ships MT7922 records with idx 3, and rejecting them made mt7921e fail to probe. Keep the record-length checks, and report those as errors so a truncated table is visible instead of a silent retry loop. Fixes: 9417c5818a01 ("wifi: mt76: mt7921: validate CLC firmware records") Reported-by: Mikhail Gavrilov Signed-off-by: Laxman Acharya Padhya Reviewed-by: Junjie Cao Tested-by: Mikhail Gavrilov Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index d34a2a3f9326c..991298475844f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -428,18 +428,23 @@ static int mt7921_load_clc(struct mt7921_dev *dev, const char *fw_name) for (offset = 0; offset < len; offset += clc_len) { if (len - offset < sizeof(*clc)) { + dev_err(mdev->dev, "Invalid CLC record\n"); ret = -EINVAL; goto out; } clc = (const struct mt7921_clc *)(clc_base + offset); clc_len = le32_to_cpu(clc->len); - if (clc_len < sizeof(*clc) || clc_len > len - offset || - clc->idx >= ARRAY_SIZE(phy->clc)) { + if (clc_len < sizeof(*clc) || clc_len > len - offset) { + dev_err(mdev->dev, "Invalid CLC record\n"); ret = -EINVAL; goto out; } + /* Newer firmware may add records this driver does not use yet */ + if (clc->idx >= ARRAY_SIZE(phy->clc)) + continue; + /* do not init buf again if chip reset triggered */ if (phy->clc[clc->idx]) continue; -- 2.53.0