From patchwork Wed Apr 17 02:44:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Yang X-Patchwork-Id: 10904391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A0BB13B5 for ; Wed, 17 Apr 2019 02:46:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2334C28725 for ; Wed, 17 Apr 2019 02:46:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11E44289CC; Wed, 17 Apr 2019 02:46:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9562A28725 for ; Wed, 17 Apr 2019 02:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GMM62ayQJiaZzaoJDHDgMykK0BOtgYhmeNLVavVabls=; b=AO9txIx/8ME8wGmENN3vKz7vRK fIUfmJuglELaT2VdynjANOgI8YBgDjonk8lMoaIPxhuCTE7F8v3DFFxxxHAFXZjG00yiQ0uNvouY1 RQTgUWN3G5jsgzVTjY4bPjkbXe+U5IH+jIc8KJ5xHYw0FZCp9NEb60w11DSV6rwboY1dMzTruBdq0 rmNVd2siu0omcIRhYO7wpkJAgCtAWLJ+XrQ7GM/QixoDf/+rczgB1bjWVu7DsA9lJtOW9QvZdySjM zJB7MlGGk89UumYm3bCOzo+v6Y1OUEb5uAedJk0edv/8yoENDhPFP4y762Pjob0m1kqa2rcNE/2de YovddXuA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGab0-00010I-9O; Wed, 17 Apr 2019 02:46:46 +0000 Received: from mxhk.zte.com.cn ([63.217.80.70]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGaax-0000zM-HI for linux-arm-kernel@lists.infradead.org; Wed, 17 Apr 2019 02:46:45 +0000 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id BACDDB0C5FAE5C22F950; Wed, 17 Apr 2019 10:46:41 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id x3H2kWX9061454; Wed, 17 Apr 2019 10:46:32 +0800 (GMT-8) (envelope-from wen.yang99@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2019041710465271-8910311 ; Wed, 17 Apr 2019 10:46:52 +0800 From: Wen Yang To: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] firmware: psci: fix leaked of_node references Date: Wed, 17 Apr 2019 10:44:52 +0800 Message-Id: <1555469093-35179-3-git-send-email-wen.yang99@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1555469093-35179-1-git-send-email-wen.yang99@zte.com.cn> References: <1555469093-35179-1-git-send-email-wen.yang99@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2019-04-17 10:46:52, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-04-17 10:46:24, Serialize complete at 2019-04-17 10:46:25, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-04-17 10:46:25 X-MAIL: mse01.zte.com.cn x3H2kWX9061454 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_194643_730691_177F49E8 X-CRM114-Status: GOOD ( 11.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wang.yi59@zte.com.cn, Mark Rutland , Lorenzo Pieralisi , Wen Yang , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The call to of_find_matching_node_and_match returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. 672 int __init psci_dt_init(void) 673 { 674 struct device_node *np; ... 678 np = of_find_matching_node_and_match(...); 679 680 if (!np || !of_device_is_available(np)) 682 return -ENODEV; ---> leaked here ... 686 return init_fn(np); ---> released here 687 } Detected by using coccinelle. Signed-off-by: Wen Yang Cc: Mark Rutland Cc: Lorenzo Pieralisi Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/firmware/psci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c80ec1d..e4143f8 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -677,8 +677,10 @@ int __init psci_dt_init(void) np = of_find_matching_node_and_match(NULL, psci_of_match, &matched_np); - if (!np || !of_device_is_available(np)) + if (!np || !of_device_is_available(np)) { + of_node_put(np); return -ENODEV; + } init_fn = (psci_initcall_t)matched_np->data; return init_fn(np);