From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 C36E34219F6 for ; Mon, 29 Jun 2026 15:00:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782745211; cv=none; b=fZ52IXdxNOD6r/I6p9YQTl3zq6oSehIdK/AQnXqPgwBWrPsvlwiic3gKVdsyrjczzl7ZzMuzE6dl3HVRCvmZBmEkl+b1ge76uhds0fthOwahoCkv51qjNcZr7q8czsn60gggal0s/kAFrdoS2TQ1B+EI8Kp0mnXpR1GK3DhvrvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782745211; c=relaxed/simple; bh=BoZDFGDHUcYSCsUO7iL2FoWS+pYeqajQa3347E6I7SI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=D2bmG6vAUwEwjCds3EGOWTtZYfB2OIdGxqJUG8e2mHBULzwUayMh34HtXDftbOcqXNXMUhlKYEPXuV7x3rfxT6iYhkLeWrQmCz++Exr6aUG92G4bXQvyRM7LH27h+VCyHHvZZWPjXALRNYW4qYYOzlLR0KUahzPXOyAL42P7eKs= 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=r1upgciS; arc=none smtp.client-ip=209.85.210.174 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="r1upgciS" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-8471013fac2so739084b3a.1 for ; Mon, 29 Jun 2026 08:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782745209; x=1783350009; 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; bh=JO1fCQG5PwkKtjMsyUkbYJB7JtjMw8bGs1lH/7GPTdc=; b=r1upgciSLcbX0bX2TTZu4w7CgdjhgxUP+f/Ke6FFvxFSrP4I9kcLpBpycYukKJNGRd P48tx5aifCA/BqUSAO+XRXvcWLRa2vHiDc2Ndq8tyyi+XjhmC/EqyIyz0c25YpwSavl0 hOpcRUIJYeKycRzIBVQJ/Ei67ZudnMCnaYwx2+lcWL5yThE0GmIxK1YTvUOfggIqQLfm EoiFZVpwwhFFNItAGfiPR+FMvE1FZtptx2Gx4WtHyhn7S6SjLqrvGtFGTjZzmz5wxHPP lC3VUPjxSc3deqz8nC72tGNIBWSDyaoStpjIMtPU87omTGRNp2gJguj7qOcddkWcvoCw ssLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782745209; x=1783350009; 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; bh=JO1fCQG5PwkKtjMsyUkbYJB7JtjMw8bGs1lH/7GPTdc=; b=SNma7yIEvTq8U22Y7jErQdKyzAq6x4T8U/lboHBs36AoKE7gXm9R7ZoYfPAOgVmj9e v8Q1Sjc2Iaka6aUaZS837p9AwIOS4ZIvzCa2USQr4UBuIuexojJBvL5KnFVaQ/I4EnpA 48Ij2KM/sF5TdbuOsihMHY8Sr8luP7mozg29bQhPUexZ4IiBMmNvAudMmngWWd95gSSV ZuRrR0VFydOvHluSna6SoLmTRna22qXGtKJN/VN8AXLzXnNhOkF3Vpe9bvOHbPHbtPta 1tUldm07KTZ31byHYsKt7FodRguJcV558R20f7lyS8B5wFH007y6byqsmfTEFXu45qZ9 ONrg== X-Forwarded-Encrypted: i=1; AHgh+RowaGV465bo8ljXmhVSE+WzR/57uP7EaOAeZ+D2k+M7fWH7Vz7oCAfSM5zyyYAkpbZB+QLJA+naDkv8cjw=@vger.kernel.org X-Gm-Message-State: AOJu0YxIJb3G/fGdAA0BTeXDFOUoar7GVpbI7iLxdTcY/ZrC0AWy9uYc +oDuEywZARVVX1EcowoH5n/Mh5TLn1wop71A4S7lSJ0TqJRbgehuiVq0 X-Gm-Gg: AfdE7cm34mObwioJqKIdgjd+uKMbAwR/B4D8ns1uY4dpVCwbTpsAfoQGF+jppm1RKpv qzCi95WrJtUuWPyKOkz1Z7WC/7kkLeXQT/y95k7mAqAblXNrxX7wUMJCCFJ/EqZJEWqaxntU1ps QrxZfvlPvMhCTr6T+0HX2Ol38NE51jSx5TLirvBQHQSdg0tpsRMwpJCApcyrzJ5eTORqUqSGA5J SApdzuXVdQvP/JvY0PicQgWecFc88sB0Lk5y+JTRH90QqHWKqQ9sVNtdBZ1yHODVTGoiyOHXeSu vq5stYimhlOx0FrEYNoUiE4ToENHiFZPnapKJ7XvNekPeKiZGn0rk8OPcPKZ8CaSJBF2m+GhMbk JriO6/aupc9Q9EizOOscdosAsVlm+vlC7qtSe3bwrB1UgbkKzzTUglBXlThFRHfdbHaw9ch5osJ OOdbNvm6mIxl5V2mYbaN98r/1ZkMZUxRLuVjf/m0TRpodh X-Received: by 2002:aa7:888f:0:b0:847:8971:87bb with SMTP id d2e1a72fcca58-8479ae75cf7mr678238b3a.21.1782745208912; Mon, 29 Jun 2026 08:00:08 -0700 (PDT) Received: from buffalo-ssd (M014013071096.v4.enabler.ne.jp. [14.13.71.96]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-845e9fa4601sm3572368b3a.6.2026.06.29.08.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 08:00:08 -0700 (PDT) From: Akari Tsuyukusa To: Yong Wu , "Joerg Roedel (AMD)" , Will Deacon , Robin Murphy , Matthias Brugger , AngeloGioacchino Del Regno , Miles Chen , Joerg Roedel Cc: Akari Tsuyukusa , iommu@lists.linux.dev (open list:MEDIATEK IOMMU DRIVER), linux-mediatek@lists.infradead.org (moderated list:MEDIATEK IOMMU DRIVER), linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH] iommu/mediatek-v1: Fix off-by-one in MT2701_LARB_NR_MAX Date: Mon, 29 Jun 2026 23:59:44 +0900 Message-ID: <20260629145946.312819-1-akkun11.open@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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 ac97dd2868d4..e907c9953142 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -88,7 +88,7 @@ struct dma_iommu_mapping { /* 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.54.0