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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 7F9E8C4CEC9 for ; Wed, 18 Sep 2019 06:31:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 574F421D56 for ; Wed, 18 Sep 2019 06:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568788283; bh=syF/NkzhqfS112J6XOsusEe1N3OzXqgGHojgwJ3CdSA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aNDCgsI4ELcfkSqEeJnLzPIIuNoyFCO0YiYmS4T29mjHnO5y0N9cKEgmlVa3X9WlJ KjBQg67hAgW1WdL7S9BhToMU6FlFrdWl3xqN5kjLIOp5wjHjD4YcV/Aozfd7ysNxkz RM1bnkbxUG1HsEVR+dTK+6/wfLw4OkL7kF4i2myI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729620AbfIRGX3 (ORCPT ); Wed, 18 Sep 2019 02:23:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:43698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729616AbfIRGX2 (ORCPT ); Wed, 18 Sep 2019 02:23:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A7F1421920; Wed, 18 Sep 2019 06:23:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787808; bh=syF/NkzhqfS112J6XOsusEe1N3OzXqgGHojgwJ3CdSA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zXdcSuCeLw40gsigEBvKbc6F2LgMvxbocLcxReUPSwlhJvLXE5SGYyiMH3QMnLTQm 1RWVVcaeC8puibihYQ05+D3WB1/BXNFs48h8zF30oMAKxnAFYrK6gWGVr5oDyBzzXY U1dcadwOqiX1YuThXIc7sk1KBrIXUDCQRyDByB0I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nishka Dasgupta , CK Hu Subject: [PATCH 4.19 42/50] drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto Date: Wed, 18 Sep 2019 08:19:25 +0200 Message-Id: <20190918061227.875064172@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061223.116178343@linuxfoundation.org> References: <20190918061223.116178343@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nishka Dasgupta commit 165d42c012be69900f0e2f8545626cb9e7d4a832 upstream. 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. Fixes: 119f5173628a (drm/mediatek: Add DRM Driver for Mediatek SoC MT8173) Signed-off-by: Nishka Dasgupta Signed-off-by: CK Hu Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -566,12 +566,15 @@ static int mtk_drm_probe(struct platform comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL); if (!comp) { ret = -ENOMEM; + of_node_put(node); goto err_node; } ret = mtk_ddp_comp_init(dev, node, comp, comp_id, NULL); - if (ret) + if (ret) { + of_node_put(node); goto err_node; + } private->ddp_comp[comp_id] = comp; }