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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 1A416C5B576 for ; Fri, 28 Jun 2019 03:21:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E70F02070D for ; Fri, 28 Jun 2019 03:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727051AbfF1DVS (ORCPT ); Thu, 27 Jun 2019 23:21:18 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:38608 "EHLO mxct.zte.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726565AbfF1DVS (ORCPT ); Thu, 27 Jun 2019 23:21:18 -0400 Received: from mse-fl1.zte.com.cn (unknown [10.30.14.238]) by Forcepoint Email with ESMTPS id 9616EB63870F7D9BE8EB; Fri, 28 Jun 2019 11:03:48 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse-fl1.zte.com.cn with ESMTP id x5S32eB0063726; Fri, 28 Jun 2019 11:02:40 +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 2019062811031059-1800718 ; Fri, 28 Jun 2019 11:03:10 +0800 From: Wen Yang To: linux-kernel@vger.kernel.org Cc: wang.yi59@zte.com.cn, Wen Yang , Patrice Chotard , Hyun Kwon , Laurent Pinchart , Mauro Carvalho Chehab , Michal Simek , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] media: xilinx: fix leaked of_node references Date: Fri, 28 Jun 2019 11:01:14 +0800 Message-Id: <1561690876-20977-2-git-send-email-wen.yang99@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1561690876-20977-1-git-send-email-wen.yang99@zte.com.cn> References: <1561690876-20977-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-06-28 11:03:10, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-06-28 11:02:45, Serialize complete at 2019-06-28 11:02:45 X-MAIL: mse-fl1.zte.com.cn x5S32eB0063726 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- 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 == NULL) { 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) -- 2.9.5