From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6955BC282C8 for ; Mon, 28 Jan 2019 15:46:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BB0E21741 for ; Mon, 28 Jan 2019 15:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690362; bh=XMCt/Am89DSH2OqT69hpegTGT7rZbwrgd6n7iSi0E8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gdBmeJWNw0aPABGEbb5qZ6c/0AYHaL7Zxg94J66cmtkMlwnYBPYEXmIcHGQ/9PSsZ I5YNSxyCRagQzWPaWy3XIH4p9B9Wpsa1H2fEhJvAfEGFSq15u0RsI2mnsJIrHnyqVn 5gZ//1nASpopJHVl67gcRtw4vKfHuy9NpfsCVaCA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727912AbfA1PqA (ORCPT ); Mon, 28 Jan 2019 10:46:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:59372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727888AbfA1Pp4 (ORCPT ); Mon, 28 Jan 2019 10:45:56 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A287121741; Mon, 28 Jan 2019 15:45:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690356; bh=XMCt/Am89DSH2OqT69hpegTGT7rZbwrgd6n7iSi0E8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mIbrFfdLCDkoFHpvR/SvTJ7tZ6NjnLFa6zuUR8U/FznsiwDYd2e1jc/ig6Ob9gCPH pNREjWfb+vhnTSzsHtrGcuEfqg8dAjNctqx8uYBt2bfrYrE5i8fDbXJLRlDns9ejWb q+mJApPh88wfNwH4Anht9oeBZuO0zNJsAvh6lNgc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yangtao Li , Thierry Reding , Sasha Levin , linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 062/304] soc/tegra: Don't leak device tree node reference Date: Mon, 28 Jan 2019 10:39:39 -0500 Message-Id: <20190128154341.47195-62-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yangtao Li [ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ] of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_tegra() doesn't do that, so fix it. Signed-off-by: Yangtao Li Acked-by: Jon Hunter [treding: slightly rewrite to avoid inline comparison] Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/soc/tegra/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/soc/tegra/common.c b/drivers/soc/tegra/common.c index cd8f41351add..7bfb154d6fa5 100644 --- a/drivers/soc/tegra/common.c +++ b/drivers/soc/tegra/common.c @@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = { bool soc_is_tegra(void) { + const struct of_device_id *match; struct device_node *root; root = of_find_node_by_path("/"); if (!root) return false; - return of_match_node(tegra_machine_match, root) != NULL; + match = of_match_node(tegra_machine_match, root); + of_node_put(root); + + return match != NULL; } -- 2.19.1