From patchwork Tue Jul 9 17:24:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishka Dasgupta X-Patchwork-Id: 11037241 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 853A114F6 for ; Tue, 9 Jul 2019 17:25:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FA8D28874 for ; Tue, 9 Jul 2019 17:25:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6420E2887E; Tue, 9 Jul 2019 17:25:18 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 1F58528892 for ; Tue, 9 Jul 2019 17:25:18 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=mUr/XX2jUKHqIkAWOluPFcAr11iZh//8mcgdo+G4Ru0=; b=hWTHaHdJ3eDJy8 ERuxeWmhDlT4AS4Aph49aDcAe9LEKxGAQ/YTmUI+5emfIy92fgz7HOsUEzV20pKcYT5Gd9oXONw7j oiSaXohNO0H1iDGtlN6w429eYA9UG8ZF7luyo+1ifs21DU13nCokTFgmsN6nOLTRgrtmcE0I1lQID kFcfPAcjaApSiVocLw7+1ETboQUBrC6gsnDl4yc6SOL7o9qwmGS5ikFkfx0bk9w9B/CJT8TObKvnX kKOZoZsJ+/Nch5cTdm7Oi5u6VkuBSbRDAbAwYlsdH1zmRyodsjo/ErCGrNfce1cLUTBN356UrfwKi uFCv/W9/J8elDNb1JcQw==; 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 1hktrh-0004yx-Qf; Tue, 09 Jul 2019 17:25:17 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hktrX-0004Wo-Cu; Tue, 09 Jul 2019 17:25:08 +0000 Received: by mail-pg1-x541.google.com with SMTP id u17so9305660pgi.6; Tue, 09 Jul 2019 10:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+XOGAmvM9zKXLd7snltlz7p/GLyc46ilwqyDiqBZzWE=; b=ZLgjzz1KVtsioZuBLGHb69PORJxE1ZDIz2hO09tJG4HqTHrd8gzEE3+lBInpEOP++z uWXBvyAa04SdBddiZOory6OjM1PGsck6p98eR/nYwISlHFYOUKaqfdGtcqcfCFeJjpjU Ve/4+JwO8UVKInXVoFSx9Eb7QPSuYiDShZJw6Wfn/mGj3FpzEndERMAii85VmO3G5wT9 ethTL/4vSVyLBYSm0erbJdtDfxdV86tEvJACtX/7R7Z4tsYpv6aRei5tDN2a+MQB8C4y XYRC7dy6PPRUNUfxdjbaIt9y8nPfEFq19acGb/lXTVoFbDkpaunwFAEiIfkdQ4QAaus0 KE0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+XOGAmvM9zKXLd7snltlz7p/GLyc46ilwqyDiqBZzWE=; b=bEfBCvhfdUh5wmX1OgvDipNDn1zmZiuIs8cgQIn0A2aTaf4+cBTyJO39cuRnnQZqT5 mBxgK3c7/zp4SX2bfhKiTDdcPaNH7qUE5xD9m4akgmrPmvzeGNGsMB98VgWLmZAOLQvB BYPKY4YZNnJuDIqtpD+LZocgxwUtk0402z3wksxaZD2xvtd9zxScsTo2MkwYkiAlzQDD ZdALOO4D9kLs/sk1RgapYQfRLInwf5j3m744TvMVNtZfyjHGz5Sk4w+SFE5nFu7MzeIM zskI2frejGzKcOKQLAicIEzKBGeOnXDfs/4MdmHjoaXRFzv5xrzB/99dQNilQ+fdopm8 oDWw== X-Gm-Message-State: APjAAAXV5u37lQueWKvezYHR0cvDta181HSZvDT7iAnQ1sW2aO+2Llzz eqo7km4BzRCAnZjkFJZ+03I= X-Google-Smtp-Source: APXvYqwLXsIz8247u+t2R6KRU6rsLxmsDMUTOhViknbtHjRrTGKfJhgq0XtVYDXMIgsn6RwRsAnqoA== X-Received: by 2002:a17:90a:32ed:: with SMTP id l100mr1308051pjb.11.1562693106952; Tue, 09 Jul 2019 10:25:06 -0700 (PDT) Received: from localhost.localdomain ([110.227.64.207]) by smtp.gmail.com with ESMTPSA id 97sm4011201pjz.12.2019.07.09.10.25.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 10:25:06 -0700 (PDT) From: Nishka Dasgupta To: minghsiu.tsai@mediatek.com, houlong.wei@mediatek.com, andrew-ct.chen@mediatek.com, mchehab@kernel.org, matthias.bgg@gmail.com, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH] media: platform: mtk-mdp: mtk_mdp_core: Add of_node_put() before goto Date: Tue, 9 Jul 2019 22:54:54 +0530 Message-Id: <20190709172454.13648-1-nishkadg.linux@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_102507_450245_FABAAE4E X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishka Dasgupta Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Each iteration of for_each_child_of_node puts the previous node, but in the case of a goto from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the goto in two places. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Acked-by: Houlong Wei --- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index fc9faec85edb..d0a3f06ad83d 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -145,13 +145,16 @@ static int mtk_mdp_probe(struct platform_device *pdev) comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL); if (!comp) { ret = -ENOMEM; + of_node_put(node); goto err_comp; } mdp->comp[comp_id] = comp; ret = mtk_mdp_comp_init(dev, node, comp, comp_id); - if (ret) + if (ret) { + of_node_put(node); goto err_comp; + } } mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME);