From patchwork Fri Jun 28 03:01:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Yang X-Patchwork-Id: 11021253 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 ACF8F924 for ; Fri, 28 Jun 2019 03:06:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D1352870B for ; Fri, 28 Jun 2019 03:06:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 903E428774; Fri, 28 Jun 2019 03:06:23 +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 0DD082870B for ; Fri, 28 Jun 2019 03:06:22 +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=8o44hNQd4QU9bSHwmPyMkF3WcIYC4e8bhP5du2aPEUQ=; b=GbDo/CQ7HW80maUeJFjIN6b+H7 Y2D9+DbVluTPImgyNRBv+P9NNldAW7JmhbgfzlePg/BncCLc/XO5XlLibb9ILpOqe4lduht1rv2jW oeAnFK2BSSCsYm0tnoiwx+tp6ESkJwBk9X/ZVu6OiUR/XUGiL3rgnhtrFBWadkw0KPjb0FllsrL7i LedB5+Wp+kHftxCx+Sym++MhfnHIihPW++mcIZQXyF6Eb6ef7uRrarx3xYxrU/tkVepQCN0rX8R6D 0VDrNX7fuUjSkGSRwHpgWS82B+hJehSsXYLfHnOwvq1L+AI8k87HxezFSGtwQK3RTa1ubidJjqmyT 55FFGIfA==; 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 1hghDS-0008Dv-4U; Fri, 28 Jun 2019 03:06:22 +0000 Received: from out1.zte.com.cn ([202.103.147.172] helo=mxct.zte.com.cn) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hghD1-0006n8-Ko for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2019 03:05:57 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190627_200555_861203_10810E61 X-CRM114-Status: GOOD ( 16.29 ) 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 , 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 --- 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) From patchwork Fri Jun 28 03:01:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Yang X-Patchwork-Id: 11021251 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 263EB14BB for ; Fri, 28 Jun 2019 03:06:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 120162870B for ; Fri, 28 Jun 2019 03:06:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F382428774; Fri, 28 Jun 2019 03:06:08 +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 8F0F82870B for ; Fri, 28 Jun 2019 03:06:08 +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=+EkNTcH3PSgXhm6DV7Pm0QeQ9KrjesErcHOXfzxqAyQ=; b=PbvSAllr7mmkGJsPGE9wP2S9j3 ZGnkYjyXbQ4sZifyv/IQFsD1m7WPmNEwwk6UyJpkLU/jCnMPcsfMXKl/1XnF0BqDpl/e6xLJ6OT7j DiNtOwm6qbva7ZFH4IJ9Vdn2EtrnLR2yP8zrdau/Ma3GxtVVKY62tOHyMsyagc/2sGzCDhE3LMX+7 pp8BvpLx48sAKewaoZospOaPLzWLpto2UE5XNM2M7b3I2O6hlWbs3yfMpkYsJmwzA1EvySHvc/Xzt GMgPLX0Ooi+ega3dWyVi3fp7+CbTqbXw+ZWL+DlnCK9SJb09U5AZwJl2ysLYB/E6rJ2BRe5Nep1vZ o1fIvKKg==; 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 1hghD1-00083f-5L; Fri, 28 Jun 2019 03:05:55 +0000 Received: from mx7.zte.com.cn ([202.103.147.169] helo=mxct.zte.com.cn) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hghCw-0006m7-Qw for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2019 03:05:53 +0000 Received: from mse-fl1.zte.com.cn (unknown [10.30.14.238]) by Forcepoint Email with ESMTPS id BBF1EA339E319CD62CE4; Fri, 28 Jun 2019 11:03:37 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse-fl1.zte.com.cn with ESMTP id x5S32eB1063726; 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 2019062811031122-1800719 ; Fri, 28 Jun 2019 11:03:11 +0800 From: Wen Yang To: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: exynos4-is: fix leaked of_node references Date: Fri, 28 Jun 2019 11:01:15 +0800 Message-Id: <1561690876-20977-3-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:11, 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 x5S32eB1063726 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190627_200551_054275_BB3BDAF0 X-CRM114-Status: GOOD ( 13.16 ) 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, linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski , Kyungmin Park , Kukjin Kim , Sylwester Nawrocki , 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/exynos4-is/fimc-is.c:813:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 807, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/fimc-is.c:870:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 807, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/fimc-is.c:885:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 807, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/media-dev.c:545:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 541, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/media-dev.c:528:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 499, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/media-dev.c:534:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 499, but without a corresponding object release within this function. Signed-off-by: Wen Yang Cc: Kyungmin Park Cc: Sylwester Nawrocki Cc: Mauro Carvalho Chehab Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/media/platform/exynos4-is/fimc-is.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index e043d55..b7cc8e6 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -806,6 +806,7 @@ static int fimc_is_probe(struct platform_device *pdev) return -ENODEV; is->pmu_regs = of_iomap(node, 0); + of_node_put(node); if (!is->pmu_regs) return -ENOMEM; diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index d53427a..a838189 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -501,6 +501,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd) continue; ret = fimc_md_parse_port_node(fmd, port, index); + of_node_put(port); if (ret < 0) { of_node_put(node); goto cleanup; @@ -542,6 +543,7 @@ static int __of_get_csis_id(struct device_node *np) if (!np) return -EINVAL; of_property_read_u32(np, "reg", ®); + of_node_put(np); return reg - FIMC_INPUT_MIPI_CSI2_0; }