From patchwork Mon Jul 1 08:29:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Yang X-Patchwork-Id: 11025259 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 F051E14C0 for ; Mon, 1 Jul 2019 08:35:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFA9620499 for ; Mon, 1 Jul 2019 08:35:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D085D204FB; Mon, 1 Jul 2019 08:35:34 +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=unavailable 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 630C120499 for ; Mon, 1 Jul 2019 08:35:34 +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: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:In-Reply-To: References:List-Owner; bh=/wf9YKb+NYEzGGwR+w5U1bOxiFikoof8ziTcBCgwsi0=; b=fp9 Tr977o9Xa2q5+9LsmJtGtn3e1BDxkW7LHYdPDCb9cnvF+9iAZmvS9TYNSKhEuem8sUOlSaO7xS82g bGJEB49b1ak2IkFn21QpRCqFfOD66M88V5EW7O/0uFgvKDoAnWa8T7mHvbpIuJomrBoyvYwc/Xfel BaO0tLuO96AyXg/iaoCqE7DyF31PB21buTNdA/ZqvAcpWe4jnVMBaClV6u80tGlyM91efYUTYJv9q YXcmuRYu3Li+ZifJCbQ/7u922I4jysyX1XOKbBGTv457QluQ6o9s/UEaKkivX6I/A0iW3X0T8/eFn /7ssRCetM9HP86ozixplS9xO511vBMw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hhrmU-0004or-7G; Mon, 01 Jul 2019 08:35:22 +0000 Received: from mxhk.zte.com.cn ([63.217.80.70]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hhrlg-0002l7-Is for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2019 08:34:35 +0000 Received: from mse-fl1.zte.com.cn (unknown [10.30.14.238]) by Forcepoint Email with ESMTPS id 1EE92B6253C01713E467; Mon, 1 Jul 2019 16:32:20 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse-fl1.zte.com.cn with ESMTP id x618VHUq005456; Mon, 1 Jul 2019 16:31:17 +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 2019070116312262-1999000 ; Mon, 1 Jul 2019 16:31:22 +0800 From: Wen Yang To: linux-kernel@vger.kernel.org Subject: [PATCH v2] media: xilinx: fix leaked of_node references Date: Mon, 1 Jul 2019 16:29:51 +0800 Message-Id: <1561969791-34369-1-git-send-email-wen.yang99@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2019-07-01 16:31:22, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-07-01 16:31:19, Serialize complete at 2019-07-01 16:31:19 X-MAIL: mse-fl1.zte.com.cn x618VHUq005456 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190701_013432_919900_4D673A3C X-CRM114-Status: GOOD ( 15.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wang.yi59@zte.com.cn, Hyun Kwon , Patrice Chotard , Michal Simek , Laurent Pinchart , xue.zhihong@zte.com.cn, cheng.shengyu@zte.com.cn, Mauro Carvalho Chehab , Wen Yang , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.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_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: drivers/media/platform/xilinx/xilinx-vipp.c:487:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 477, but without a corresponding object release within this function. drivers/media/platform/xilinx/xilinx-vipp.c:491:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 477, but without a corresponding object release within this function. drivers/media/platform/xilinx/xilinx-tpg.c:732:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 717, but without a corresponding object release within this function. drivers/media/platform/xilinx/xilinx-tpg.c:741:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 717, but without a corresponding object release within this function. drivers/media/platform/xilinx/xilinx-tpg.c:757:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 717, but without a corresponding object release within this function. drivers/media/platform/xilinx/xilinx-tpg.c:764:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 717, but without a corresponding object release within this function. Signed-off-by: Wen Yang Cc: Patrice Chotard Cc: Hyun Kwon Cc: Laurent Pinchart Cc: Mauro Carvalho Chehab Cc: Michal Simek Cc: linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- v2: fix Comparison to NULL drivers/media/platform/xilinx/xilinx-tpg.c | 18 +++++++++++++----- drivers/media/platform/xilinx/xilinx-vipp.c | 8 +++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/xilinx/xilinx-tpg.c b/drivers/media/platform/xilinx/xilinx-tpg.c index ed01bed..e71d022 100644 --- a/drivers/media/platform/xilinx/xilinx-tpg.c +++ b/drivers/media/platform/xilinx/xilinx-tpg.c @@ -713,10 +713,13 @@ static int xtpg_parse_of(struct xtpg_device *xtpg) struct device_node *port; unsigned int nports = 0; bool has_endpoint = false; + int ret = 0; ports = of_get_child_by_name(node, "ports"); - if (ports == NULL) + if (!ports) { ports = node; + of_node_get(ports); + } for_each_child_of_node(ports, port) { const struct xvip_video_format *format; @@ -729,7 +732,8 @@ static int xtpg_parse_of(struct xtpg_device *xtpg) if (IS_ERR(format)) { dev_err(dev, "invalid format in DT"); of_node_put(port); - return PTR_ERR(format); + ret = PTR_ERR(format); + goto out_put_node; } /* Get and check the format description */ @@ -738,7 +742,8 @@ static int xtpg_parse_of(struct xtpg_device *xtpg) } else if (xtpg->vip_format != format) { dev_err(dev, "in/out format mismatch in DT"); of_node_put(port); - return -EINVAL; + ret = -EINVAL; + goto out_put_node; } if (nports == 0) { @@ -754,14 +759,17 @@ static int xtpg_parse_of(struct xtpg_device *xtpg) if (nports != 1 && nports != 2) { dev_err(dev, "invalid number of ports %u\n", nports); - return -EINVAL; + ret = -EINVAL; + goto out_put_node; } xtpg->npads = nports; if (nports == 2 && has_endpoint) xtpg->has_input = true; - return 0; +out_put_node: + of_node_put(ports); + return ret; } static int xtpg_probe(struct platform_device *pdev) diff --git a/drivers/media/platform/xilinx/xilinx-vipp.c b/drivers/media/platform/xilinx/xilinx-vipp.c index edce040..307717c 100644 --- a/drivers/media/platform/xilinx/xilinx-vipp.c +++ b/drivers/media/platform/xilinx/xilinx-vipp.c @@ -472,7 +472,7 @@ static int xvip_graph_dma_init(struct xvip_composite_device *xdev) { struct device_node *ports; struct device_node *port; - int ret; + int ret = 0; ports = of_get_child_by_name(xdev->dev->of_node, "ports"); if (ports == NULL) { @@ -484,11 +484,13 @@ static int xvip_graph_dma_init(struct xvip_composite_device *xdev) ret = xvip_graph_dma_init_one(xdev, port); if (ret < 0) { of_node_put(port); - return ret; + goto out_put_node; } } - return 0; +out_put_node: + of_node_put(ports); + return ret; } static void xvip_graph_cleanup(struct xvip_composite_device *xdev)