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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 79683C169C4 for ; Mon, 11 Feb 2019 14:23:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E531222A1 for ; Mon, 11 Feb 2019 14:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549894999; bh=DFw1/K3/fU/OVN4nkskxkQQ0xAFswGWWhMMlcDMBXvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VTGGCYWmV59IFpU5lGuUQ9cvPmrmQyHAOd3iOFGy9A1uwu8DPN0szjREqSPcU4Q+v O1eGmrekHznzT0KLg6S6WMM//Ba2I2OiSKLIYGj1S5hm6ZdTdqW7KkcoXU3vspmPsX 5+H1xQuMy64eUiOdPYxp9m4kiK/m2uXL2uhXaOuM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728959AbfBKOXR (ORCPT ); Mon, 11 Feb 2019 09:23:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:56234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727914AbfBKOXN (ORCPT ); Mon, 11 Feb 2019 09:23:13 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB8CC222A1; Mon, 11 Feb 2019 14:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549894993; bh=DFw1/K3/fU/OVN4nkskxkQQ0xAFswGWWhMMlcDMBXvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WCsTyJNPk0hp0qQTu6iNhaUle/zngCkpmYA8kYVIwIAbHiRQZ1x4nug6Kg3Ws4MlK YU5CxI6xtBv3TILIk7iDo1qyuzIazy2uTphh8e2kWEGWVbKmbxhICsGjM30pbjLHqO PFcv+jJYwxvJTeV8eNGcu32t/txoeEN0C2OHDxVw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yangtao Li , Jon Hunter , Thierry Reding , Sasha Levin Subject: [PATCH 4.20 056/352] soc/tegra: Dont leak device tree node reference Date: Mon, 11 Feb 2019 15:14:43 +0100 Message-Id: <20190211141849.742009715@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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