From nobody Sun Sep 22 01:56:13 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEB3AC43334 for ; Fri, 1 Jul 2022 05:41:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234105AbiGAFlC (ORCPT ); Fri, 1 Jul 2022 01:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233418AbiGAFk4 (ORCPT ); Fri, 1 Jul 2022 01:40:56 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C87F368A38 for ; Thu, 30 Jun 2022 22:40:54 -0700 (PDT) X-UUID: ef2711168af04526a7688688f0043054-20220701 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.7,REQID:c9e7b6ea-fc87-40c5-bef8-9e1fc2e97857,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACT ION:release,TS:-5 X-CID-META: VersionHash:87442a2,CLOUDID:2ec353d6-5d6d-4eaf-a635-828a3ee48b7c,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: ef2711168af04526a7688688f0043054-20220701 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2132920237; Fri, 01 Jul 2022 13:40:48 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Fri, 1 Jul 2022 13:40:47 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 1 Jul 2022 13:40:45 +0800 From: Yong Wu To: Joerg Roedel , Matthias Brugger , Will Deacon CC: , , , , , Yong Wu , AngeloGioacchino Del Regno , , , , , , , , Guenter Roeck , Dan Carpenter Subject: [PATCH v3 5/7] iommu/mediatek: Validate number of phandles associated with "mediatek,larbs" Date: Fri, 1 Jul 2022 13:39:40 +0800 Message-ID: <20220701053942.3266-6-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220701053942.3266-1-yong.wu@mediatek.com> References: <20220701053942.3266-1-yong.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Guenter Roeck Fix the smatch warnings: drivers/iommu/mtk_iommu.c:878 mtk_iommu_mm_dts_parse() error: uninitialized symbol 'larbnode'. If someone abuse the dtsi node(Don't follow the definition of dt-binding), for example "mediatek,larbs" is provided as boolean property, "larb_nr" will be zero and cause abnormal. To fix this problem and improve the code safety, add some checking for the invalid input from dtsi, e.g. checking the larb_nr/larbid valid range, and avoid "mediatek,larb-id" property conflicts in the smi-larb nodes. Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYP= E") Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Guenter Roeck Signed-off-by: Yong Wu Reviewed-by: AngeloGioacchino Del Regno --- drivers/iommu/mtk_iommu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index aa0973bafde1..88d0dad36067 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -1052,6 +1052,8 @@ static int mtk_iommu_mm_dts_parse(struct device *dev,= struct component_match **m larb_nr =3D of_count_phandle_with_args(dev->of_node, "mediatek,larbs", NU= LL); if (larb_nr < 0) return larb_nr; + if (larb_nr =3D=3D 0 || larb_nr > MTK_LARB_NR_MAX) + return -EINVAL; =20 for (i =3D 0; i < larb_nr; i++) { u32 id; @@ -1070,6 +1072,11 @@ static int mtk_iommu_mm_dts_parse(struct device *dev= , struct component_match **m ret =3D of_property_read_u32(larbnode, "mediatek,larb-id", &id); if (ret)/* The id is consecutive if there is no this property */ id =3D i; + if (id >=3D MTK_LARB_NR_MAX) { + of_node_put(larbnode); + ret =3D -EINVAL; + goto err_larbdev_put; + } =20 plarbdev =3D of_find_device_by_node(larbnode); of_node_put(larbnode); @@ -1077,6 +1084,11 @@ static int mtk_iommu_mm_dts_parse(struct device *dev= , struct component_match **m ret =3D -ENODEV; goto err_larbdev_put; } + if (data->larb_imu[id].dev) { + platform_device_put(plarbdev); + ret =3D -EEXIST; + goto err_larbdev_put; + } data->larb_imu[id].dev =3D &plarbdev->dev; =20 if (!plarbdev->dev.driver) { --=20 2.18.0