From nobody Sat Sep 21 14:13:20 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 B685DC4332F for ; Tue, 18 Oct 2022 02:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231165AbiJRCoH (ORCPT ); Mon, 17 Oct 2022 22:44:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231218AbiJRCnu (ORCPT ); Mon, 17 Oct 2022 22:43:50 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9099795E7E for ; Mon, 17 Oct 2022 19:43:47 -0700 (PDT) X-UUID: 0342d1e47c5142f393f18d683981a361-20221018 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=KNetZl/o2JnPeD3E+CZiSVznpIXZE73PG4SwXrc1kJQ=; b=gw07ymVeq2l7OIDajuf1tEFx9DSA+F7GWo5Ah+ghNPDLOzFDvkaa9b0KKa8phHMf+UV6iUMgsN6J2Ho9dubC3xWk/+SqYzGPMMirg5TLYpLWFhDWVa4eePzK+L3hT3oVWampBkQtgZHcQ0tRyNvyNt3BQgT1D+uni/FJZci0ZbM=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:ecf00dfc-66a4-4593-9543-3e95ce17ba79,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:70 X-CID-INFO: VERSION:1.1.11,REQID:ecf00dfc-66a4-4593-9543-3e95ce17ba79,IP:0,URL :0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTI ON:quarantine,TS:70 X-CID-META: VersionHash:39a5ff1,CLOUDID:f7ef18a4-ebb2-41a8-a87c-97702aaf2e20,B ulkID:221018104344NXHIJVHW,BulkQuantity:0,Recheck:0,SF:38|28|17|19|48,TC:n il,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 0342d1e47c5142f393f18d683981a361-20221018 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1367881281; Tue, 18 Oct 2022 10:43:42 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Tue, 18 Oct 2022 10:43:41 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Tue, 18 Oct 2022 10:43:40 +0800 From: Yong Wu To: Joerg Roedel , Matthias Brugger , Will Deacon CC: Robin Murphy , , , , , Yong Wu , AngeloGioacchino Del Regno , , , , , , , , Guenter Roeck , Dan Carpenter Subject: [PATCH v7 4/6] iommu/mediatek: Validate number of phandles associated with "mediatek,larbs" Date: Tue, 18 Oct 2022 10:42:56 +0800 Message-ID: <20221018024258.19073-5-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20221018024258.19073-1-yong.wu@mediatek.com> References: <20221018024258.19073-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 Reviewed-by: Matthias Brugger --- 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 912322494bc0..9cbff48f03c0 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -1050,6 +1050,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; @@ -1068,6 +1070,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); @@ -1075,6 +1082,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