From patchwork Wed Apr 20 01:49:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12819592 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 072E2C433EF for ; Wed, 20 Apr 2022 01:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fZfxvHqXjGhunVuEU6VchLNxBVI6VFlEWy1mTDljVkc=; b=T7CmiH1Mc6hV++ 6UlIGKny4nRcqwXKC/M+xs5SPlaBj09CgWnTqsX7agclCrhxYBeAArdFzvR9Kb3F0V94NU37hKTnD yJt4CbnWUPYDMejbbH89hanzosl8LMiedPO8BAQUJ4EMj0a1YTymjCsF5spa91TNkaaiA0QmH8A+N kw6PByCoOJDK5YPZs7O6wQ2HGPjwm0T4o1IzYhkzukIbqJvDk/YiBi4/9rK0M9HURk81vIKPnCteP 88hmFQYSYjKt7ZhQ+c8rde5k+5wP9aER0RzJPZD+Vr7D/dqXwhdqlDaoqlQLQFM3igoDd4ye9ESn3 mMhTlDPppTHKZO8RAdcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ngzTA-006tEl-QM; Wed, 20 Apr 2022 01:49:24 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ngzT8-006tE9-1T for linux-arm-kernel@lists.infradead.org; Wed, 20 Apr 2022 01:49:23 +0000 Received: by mail-pg1-x533.google.com with SMTP id q12so160347pgj.13 for ; Tue, 19 Apr 2022 18:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/UuWmXAeK3wDg34COXqd7JHzyxxdodWHUXeYP3t+DVM=; b=jNy+tVOlKTuaYase1uWbsaybUMzAQOYmfdHlgLhP/+zTF8xCAUk/rP1NoLEGiss6Ci 8qkBAnee5LdixG9PAXR78Oh8mQtv1kvTWP7aD6/ans2MUS8VItAiXi29L6eVczGyZ5Gk O9Qyer2uqerzeN7dx4kFdxCkpGRACMwyQmfXq9KmBIv5s6TxXgXU3PpOziZzKuX5PLik 9ciG9eSVuwEK8pTOA4H+l7gR4xJegCf7bUg2hDXyi8H6nGdC/fypU7slc7C2UTtKBBa4 naCTHZbfiuCV7cDhsc64yGZCVU7gLq8M7oy4C2pkMiGKaNe3L6SmTIuAh9u21UEuE1rU 2q+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/UuWmXAeK3wDg34COXqd7JHzyxxdodWHUXeYP3t+DVM=; b=p7iHw4SZeemAogybkS9axAJ65NzKQFT7Et2D5dB4GUoaLPGc9eLXDuD1TD+pvIhZ9q WOB/vDt/72RXJ7nXU84PLkIcXqVNnMQeCfG5pTCDdfzD98p3PCuZB3b1MVgWLC9Sgf8z 2HBLrUnb3J1tmQ3eohcZ4Wt3c0G81s9g4NDxp4Lz2XrJgz5iyGLCJqsEwvLH6tQPCVOQ MfnsFJFc3R0/9KQfo83L9thfpx2xfb4y9saY9WxahTvmxnWdynKqmwbZDDzd75msW5IK rVi7R0UBJDhhIaixv/kGYJ1/FlX9M2TC7LHbMjNyDPlAviNAlBLp15YKASusjJteouE2 lMNQ== X-Gm-Message-State: AOAM532H8yV1LgYve/7c7flh/YkvRrJdlhyCU8kYLLkOA8feDtlOipuh xneX7+aoR7AbqMJtYrOJxyE= X-Google-Smtp-Source: ABdhPJw58IDvs8PX3F7lrr3iHelhvA0R312SWs14z9YL08C1HaVgt0xmXyKbe63xjiK6qsGJlYlidA== X-Received: by 2002:a05:6a00:2489:b0:50a:754c:c557 with SMTP id c9-20020a056a00248900b0050a754cc557mr13590297pfv.37.1650419359982; Tue, 19 Apr 2022 18:49:19 -0700 (PDT) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id x20-20020aa79574000000b005061f4782c5sm17543755pfq.183.2022.04.19.18.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 18:49:19 -0700 (PDT) From: Miaoqian Lin To: Stefano Stabellini , Russell King , Shannon Zhao , Catalin Marinas , Julien Grall , Oleksandr Tyshchenko , Juergen Gross , xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH v2] arm/xen: Fix some refcount leaks Date: Wed, 20 Apr 2022 01:49:13 +0000 Message-Id: <20220420014913.2586-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220406021905.GA30436@8345e2a12d0c> References: <20220406021905.GA30436@8345e2a12d0c> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220419_184922_139567_0E1A69E3 X-CRM114-Status: GOOD ( 15.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The of_find_compatible_node() function returns a node pointer with refcount incremented, We should use of_node_put() on it when done Add the missing of_node_put() to release the refcount. Fixes: 9b08aaa3199a ("ARM: XEN: Move xen_early_init() before efi_init()") Fixes: b2371587fe0c ("arm/xen: Read extended regions from DT and init Xen resource") Signed-off-by: Miaoqian Lin Reviewed-by: Stefano Stabellini --- changes in v2: - call of_node_put in non-error path in xen_dt_guest_init - fix same refcount leak error in arch_xen_unpopulated_init --- arch/arm/xen/enlighten.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index ec5b082f3de6..07eb69f9e7df 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -337,12 +337,15 @@ int __init arch_xen_unpopulated_init(struct resource **res) if (!nr_reg) { pr_err("No extended regions are found\n"); + of_node_put(np); return -EINVAL; } regs = kcalloc(nr_reg, sizeof(*regs), GFP_KERNEL); - if (!regs) + if (!regs) { + of_node_put(np); return -ENOMEM; + } /* * Create resource from extended regions provided by the hypervisor to be @@ -403,8 +406,8 @@ int __init arch_xen_unpopulated_init(struct resource **res) *res = &xen_resource; err: + of_node_put(np); kfree(regs); - return rc; } #endif @@ -424,8 +427,10 @@ static void __init xen_dt_guest_init(void) if (of_address_to_resource(xen_node, GRANT_TABLE_INDEX, &res)) { pr_err("Xen grant table region is not found\n"); + of_node_put(xen_node); return; } + of_node_put(xen_node); xen_grant_frames = res.start; }