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 2D56E29992B; Sat, 12 Sep 2026 16:08:35 +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=1789229316; cv=none; b=JHmiE3QBvjyM+eE/Uwg/uZ947A9tYVDL85bDUZWurDxzsFs/s93ClYZwpqHfchgrJbKluL7isKUFyxTcdHxmvWkpvTN5W8HqSBnYMzHPE3gs/C6DbGuzlhQXws/EhxdirGlIN9b15S9SKLSzv865R0w25hPE/ZVN/aVTFp0Y/Ac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789229316; c=relaxed/simple; bh=xzeZmz7aihpEiKMvsUYbslGiI20Of6AV5IFYrHSlP04=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MciIS9nuAKuGXUUzn762ezunW773xy2vKcPFJD+dy3F+VRnOVEEbUQdWWzWgKquWublh1yzMXNpxcdejVspr9tLIc5fpSHPUYVIb+4XaJEHRdQRn2sEdWNgCqE7rCqkG6QIbIHcndcDvweq+ZcwCRJu911DUYn4gnSDJ+E9MCns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kyV29iyX; 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="kyV29iyX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3F241F000FF; Sat, 12 Sep 2026 16:08:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789229315; bh=j3XR4rCJMC6Z1ukolVMoBmvKnQuA77e/gm34APSFILM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kyV29iyXMaRxb7zTcZsGlWkNHS2iyIqUuiGpt98IRXNCH6DR3zX2KcoIHVaxyYvi9 HYQdmde5K704/FPFOc7dThfKqSFUtZ8AwPSGt7s4aLJFdFCDnzb0OFx7qoMc5oRu01 SVR2LwruPq3VgXXpmMo/Lpxc1j0W0VHQEWsyDAwE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Akari Tsuyukusa , Joerg Roedel , Sasha Levin Subject: [PATCH 6.1 0566/1191] iommu/mediatek-v1: Fix off-by-one in MT2701_LARB_NR_MAX Date: Sat, 12 Sep 2026 08:54:54 +0200 Message-ID: <20260912065600.960557848@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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: Akari Tsuyukusa [ Upstream commit aebaa93f3da1572877579c2e15ebf27be2dcc7fb ] The mt2701_m4u_in_larb[] array contains 4 (for LARB0 to LARB3) elements, meaning mt2701_m4u_to_larb() can legitimately return 3. The current check `if (larbid >= MT2701_LARB_NR_MAX)` incorrectly rejects valid LARB3 with -EINVAL. Fix this off-by-one error by updating MT2701_LARB_NR_MAX to 4. Note that this does not cause immediate issues with the current mt2701.dtsi and mt7623n.dtsi because it only defines 3 LARBs: mediatek,larbs = <&larb0 &larb1 &larb2>; Thus, larbid never reaches 3 in the existing upstream device tree. Fixes: de78657e16f4 ("iommu/mediatek: Fix NULL pointer dereference when printing dev_name") Signed-off-by: Akari Tsuyukusa Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/mtk_iommu_v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 3204371b2eb4c..ff6deb7830a4d 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -78,7 +78,7 @@ /* MTK generation one iommu HW only support 4K size mapping */ #define MT2701_IOMMU_PAGE_SHIFT 12 #define MT2701_IOMMU_PAGE_SIZE (1UL << MT2701_IOMMU_PAGE_SHIFT) -#define MT2701_LARB_NR_MAX 3 +#define MT2701_LARB_NR_MAX 4 /* * MTK m4u support 4GB iova address space, and only support 4K page -- 2.53.0