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,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 4D78DC282C8 for ; Mon, 28 Jan 2019 16:21:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 153012147A for ; Mon, 28 Jan 2019 16:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692468; bh=29NqEJudaJ3cLSxzXxRj6k7Q/OXVHVFIiDc0EuKv6rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XoSosGcIAmfPsme5EbIMbB5CqJ3nVvmIwUHMxeJeNxZXboTPAfw51H0qEHJo08CA4 WTIwY+vMJyWcbfD1xNyCYj+6bZ+AjciM+QkJtFMJ6NhPlc7JLkxIld8IFLqq1jsRXz 9vc1l1zi/KT58tjst6zd57k94i0pn4eyflGiE6Xk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388958AbfA1QVH (ORCPT ); Mon, 28 Jan 2019 11:21:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:56820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388953AbfA1QVG (ORCPT ); Mon, 28 Jan 2019 11:21:06 -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 A16792173C; Mon, 28 Jan 2019 16:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692466; bh=29NqEJudaJ3cLSxzXxRj6k7Q/OXVHVFIiDc0EuKv6rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YwJtGoMAixTvI2Ajma1MSMTXj60xRDIknUW4C4jVsK73xO20mwT6GRxD+AztvNViw ucFOPuXfhjVoHYv+ypkOLitFfviYPhKaXQnIsJkW5rUmULQjFG2JhPDi8iYpcPw2Uy JMEzGOjshfkPlhBCfQRYqsLVAwD/AcBl4mPdZTIc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yangtao Li , Florian Fainelli , Sasha Levin Subject: [PATCH AUTOSEL 4.9 030/107] soc: bcm: brcmstb: Don't leak device tree node reference Date: Mon, 28 Jan 2019 11:18:30 -0500 Message-Id: <20190128161947.57405-30-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161947.57405-1-sashal@kernel.org> References: <20190128161947.57405-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yangtao Li [ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ] 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_brcmstb() doesn't do that, so fix it. [treding: slightly rewrite to avoid inline comparison] Fixes: d52fad262041 ("soc: add stubs for brcmstb SoC's") Signed-off-by: Yangtao Li Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- drivers/soc/bcm/brcmstb/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c index 94e7335553f4..3f6063b639ac 100644 --- a/drivers/soc/bcm/brcmstb/common.c +++ b/drivers/soc/bcm/brcmstb/common.c @@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = { bool soc_is_brcmstb(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(brcmstb_machine_match, root) != NULL; + match = of_match_node(brcmstb_machine_match, root); + of_node_put(root); + + return match != NULL; } static const struct of_device_id sun_top_ctrl_match[] = { -- 2.19.1