From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Osipenko Subject: [PATCH v4 1/3] drm/tegra: output: Don't leak OF node on error Date: Fri, 17 Apr 2020 20:52:36 +0300 Message-ID: <20200417175238.27154-2-digetx@gmail.com> References: <20200417175238.27154-1-digetx@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200417175238.27154-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Thierry Reding , Sam Ravnborg , Laurent Pinchart Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org The OF node should be put before returning error in tegra_output_probe(), otherwise node's refcount will be leaked. Reviewed-by: Laurent Pinchart Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/output.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index e36e5e7c2f69..a6a711d54e88 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output) panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { output->panel = of_drm_find_panel(panel); + of_node_put(panel); + if (IS_ERR(output->panel)) return PTR_ERR(output->panel); - - of_node_put(panel); } output->edid = of_get_property(output->of_node, "nvidia,edid", &size); @@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output) ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0); if (ddc) { output->ddc = of_find_i2c_adapter_by_node(ddc); + of_node_put(ddc); + if (!output->ddc) { err = -EPROBE_DEFER; - of_node_put(ddc); return err; } - - of_node_put(ddc); } output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev, -- 2.26.0 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.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 95299C352BE for ; Sat, 18 Apr 2020 09:27:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 694AF21D82 for ; Sat, 18 Apr 2020 09:27:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DPUU6a0i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 694AF21D82 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D1436EC85; Sat, 18 Apr 2020 09:26:38 +0000 (UTC) Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C90656E124 for ; Fri, 17 Apr 2020 17:54:50 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id k21so2958456ljh.2 for ; Fri, 17 Apr 2020 10:54:50 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=pVig2XpcIi1wUU1dzHSjXjcQnTVD/QNrePxBnDzBNIU=; b=DPUU6a0iy8DAotclL1Bt81ah0Or3GtD0+dChp+lHlSXmGB8kysZ6r9FbOXAJpnTGWV 1MJBh+CPPbv10t1SEDUcTT1dZaeEibqoZgtykLH9W+Uj8yPQDAuaqb2ks8quw98r3nrg XU796S36wcrw+VUSyNhtpqbCsWd+DkxdlLGD3gurgw46GR9jNln95Ek0MNYGpPIJXrkU DzrhGmnDmtA8v+/EXeTwIojY/zLzTyYqP4Qw+/G35DCjughaQYJd6KeektIKllo+IJ+E 8/OXrhyEWqKiS0PyW+66aeFi3T1TxA5NkXsncM81a31F9bsttj8BLMOlbxMdE/+Banbf GINg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=pVig2XpcIi1wUU1dzHSjXjcQnTVD/QNrePxBnDzBNIU=; b=jgLqHhRYHvyfc1n2rXQRqC6cpdjlTJtNotIL5OfHC1U/64oKRgvQc/yEGXXpexvru9 kNkKp5h9ICkYPegosO9HtEVWVQQ87PG5b5Zv0vGiMRH5RC8NFuEzUY2UVTxiJdV2XSOj fParY9fFS+61LQFzfkObuk4aLzFtBDMLK4sutCgSIYRtpfp0x0ItyqJOPbGxSNSrp4F6 65XGnzuojgaYlyksArmH9ryFrF+4n3DIWabTIHaVHUnZxItOZO2V49em8LtknRPRrNXE rF5yPbP/48LUuq6ntjYUPbdi45opoPwpR7yvqIS5Ea+N6hIFjHfnrZuqfJjN3jUersyu +L9Q== X-Gm-Message-State: AGi0PuZm87GHX3bGxOlUMOE6MRfd0ACzPEpKHhKUkmLlRW3KZxcFG6Xe +q7+8tqS8kr1oc+Vp6pdk/s= X-Google-Smtp-Source: APiQypILZrkqG5hAVUaDseO32nMzi3/C2Q7vP4vjEu67S83PDI8GaNjtl9ZwQ/N5SYtCxQUfGILT3w== X-Received: by 2002:a2e:6c05:: with SMTP id h5mr2810388ljc.217.1587146089229; Fri, 17 Apr 2020 10:54:49 -0700 (PDT) Received: from localhost.localdomain (ppp91-78-208-152.pppoe.mtu-net.ru. [91.78.208.152]) by smtp.gmail.com with ESMTPSA id j15sm7204358lja.71.2020.04.17.10.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 10:54:48 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Sam Ravnborg , Laurent Pinchart Subject: [PATCH v4 1/3] drm/tegra: output: Don't leak OF node on error Date: Fri, 17 Apr 2020 20:52:36 +0300 Message-Id: <20200417175238.27154-2-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200417175238.27154-1-digetx@gmail.com> References: <20200417175238.27154-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 18 Apr 2020 09:26:15 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The OF node should be put before returning error in tegra_output_probe(), otherwise node's refcount will be leaked. Reviewed-by: Laurent Pinchart Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/output.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index e36e5e7c2f69..a6a711d54e88 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output) panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { output->panel = of_drm_find_panel(panel); + of_node_put(panel); + if (IS_ERR(output->panel)) return PTR_ERR(output->panel); - - of_node_put(panel); } output->edid = of_get_property(output->of_node, "nvidia,edid", &size); @@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output) ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0); if (ddc) { output->ddc = of_find_i2c_adapter_by_node(ddc); + of_node_put(ddc); + if (!output->ddc) { err = -EPROBE_DEFER; - of_node_put(ddc); return err; } - - of_node_put(ddc); } output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev, -- 2.26.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel