Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3028524rwb; Mon, 15 Aug 2022 16:26:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR4uvGZr6G5mTwoRF6Y36qFd+k05qDDPUjnvMGHM956hOmNE1F8zWO1TfKL7xrxmxGT8xCwa X-Received: by 2002:a17:907:75e8:b0:730:ccd3:2683 with SMTP id jz8-20020a17090775e800b00730ccd32683mr11819809ejc.329.1660605939505; Mon, 15 Aug 2022 16:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660605939; cv=none; d=google.com; s=arc-20160816; b=LYNM1bYtWXeH4qTDppDaaVqYGxTh6qzk/8QgOCvEcQclZXh1Np7h+jZILyCkIUXlV/ mon9jJ+d6ggboxzGRl1Lz9FgBaUSz8K+60d2JpUKRa7vaCGOQZaDn95Dxshr54X9m1im ECG5gy0wxNbJ3vs6K++DcTT7vG3hegmymfWp0ZxFz7kFIxfJOnST3UHB9qDXQK/ht2zi 3VtBbHyiXvEtsdSIvL3noMNoA6WwBRF8Wf35IvTvEAJvnxlJXFL2/BkkvtxwTVkNqNfA dKFapX1+U2HTfI1RB8Q3aAmiuoMfH6X5+uNGeKe4+AtOlIAgBlU6pnYu4zGyGBgbU0fC Pj8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZH1Iqm77lCz5sUWPLwLG8aYrjc9FZWYjMhkPnuzdQPs=; b=Pesn2LkFyY2rXMADsSxcBabrDf6fEx2ZDuYwNEGL2lL5uJFEm8+1477SGI0GH8HzQN ehaB29sSLfgZJWPL2PeL8jwF7dd86f8uRFRAJCgQMHfK9gXMwIcFtoiWAl9bhs/PhqfS d17b9oGLeJyGbPUkxEf6SDIF91akWbMzA+CCwBQW1sRflmInZO+EmcRGaTyQ0sweJnI0 t0zxEVsUyAbAjOPKORYAN3n3E3rqLQjgBROlshn8DfCrfw6KOMLH9VWyzyt4qp4YVitN v85sKnw3+yghk79De28uU7PhdpMfDOJbUjTWF5/NIUy09kxR+ckRYSIcYWFQ7PXBXRJq q0iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KpxGVi30; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sd5-20020a1709076e0500b007330a081f1fsi8542212ejc.679.2022.08.15.16.25.13; Mon, 15 Aug 2022 16:25:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KpxGVi30; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241970AbiHOW5B (ORCPT + 99 others); Mon, 15 Aug 2022 18:57:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352278AbiHOWyF (ORCPT ); Mon, 15 Aug 2022 18:54:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9D813AE07; Mon, 15 Aug 2022 12:54:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 656EB612A4; Mon, 15 Aug 2022 19:54:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B584C433D7; Mon, 15 Aug 2022 19:54:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593294; bh=lCT1j9g6C8VJGJ3kCsSS9uDzFCCqHmR/3FmqLXKyelw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KpxGVi30UFvqVFkZ5DPgzIvGHjvQ3KWWyDxqbI+evNdX+GtEdSl7XWESTmLo69Qlm 3XJGFe1UWHiZzXcu1yYZp8sqZL3ZDEZzuclMC4UsS3cgZMG4r0RjtEsE15NlZmm6aM hyXbDFDBxoYjlDDrNjh/KRd0gLvvdewzB8XRUwmg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liang He , Will Deacon , Sasha Levin Subject: [PATCH 5.18 0895/1095] iommu/arm-smmu: qcom_iommu: Add of_node_put() when breaking out of loop Date: Mon, 15 Aug 2022 20:04:54 +0200 Message-Id: <20220815180506.341318302@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Liang He [ Upstream commit a91eb6803c1c715738682fece095145cbd68fe0b ] In qcom_iommu_has_secure_context(), we should call of_node_put() for the reference 'child' when breaking out of for_each_child_of_node() which will automatically increase and decrease the refcount. Fixes: d051f28c8807 ("iommu/qcom: Initialize secure page table") Signed-off-by: Liang He Link: https://lore.kernel.org/r/20220719124955.1242171-1-windhl@126.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index 4c077c38fbd6..c11d2c2cbb62 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -750,9 +750,12 @@ static bool qcom_iommu_has_secure_context(struct qcom_iommu_dev *qcom_iommu) { struct device_node *child; - for_each_child_of_node(qcom_iommu->dev->of_node, child) - if (of_device_is_compatible(child, "qcom,msm-iommu-v1-sec")) + for_each_child_of_node(qcom_iommu->dev->of_node, child) { + if (of_device_is_compatible(child, "qcom,msm-iommu-v1-sec")) { + of_node_put(child); return true; + } + } return false; } -- 2.35.1