From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Osipenko Subject: [PATCH v6 3/6] drm/tegra: output: Don't leak OF node on error Date: Tue, 9 Jun 2020 16:28:52 +0300 Message-ID: <20200609132855.20975-4-digetx@gmail.com> References: <20200609132855.20975-1-digetx@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200609132855.20975-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Thierry Reding , Sam Ravnborg , Laurent Pinchart , Rob Herring , Frank Rowand Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-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 Reviewed-by: Sam Ravnborg 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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 A475EC433DF for ; Tue, 9 Jun 2020 13:29:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C14D2074B for ; Tue, 9 Jun 2020 13:29:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZFwKVZmJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729884AbgFIN3U (ORCPT ); Tue, 9 Jun 2020 09:29:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729159AbgFIN3R (ORCPT ); Tue, 9 Jun 2020 09:29:17 -0400 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A689C08C5C2; Tue, 9 Jun 2020 06:29:15 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id e4so25073041ljn.4; Tue, 09 Jun 2020 06:29:15 -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=h/buGMp+Ss9uiUTlhYkjRB/SevbvsV7Suq67TOhl6lM=; b=ZFwKVZmJ8MZiS+yKqDOG1+DhkcEJJCq/2FLEmxlbnI8iOoQ0pvvcX+9WbJnEL4Y07y q0s3iTqppiEmQg/QWgIF1Hh38LG0s+86Y4cCi1NJY325/Lopu1av7FBHu0RuyEhrOCHo v3dI0Ke2MXFFbZRg3xm1m9Rz59DXhcn+5oYzXaLGP99IwsJVaWzk1LYRtIMx3JAKlxrm kfLLc/RO7ZUEDNvYOIatxGVHjr7vO25gfP4ECoZUXDMZ+lR8HkBjTvd6o8LoHd/+Hrs1 tU/p5ClJJIl5wYjdTVXUvPcv6l2IYek75ImnUD/eilhDdAzF1monsFjDZvQzVtl5tt4f HBLA== 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=h/buGMp+Ss9uiUTlhYkjRB/SevbvsV7Suq67TOhl6lM=; b=tRFqiJmpOYuaNaKWpMPGyq6f+CEWpJPDPxkatCskBLfltpNYMj8FBa/LiGVdfTXiL0 Y7E0iHMCPXUX+piIuXSwk82i0Egi0FSNtpsSWKm+AOOiBJlfe1S4KiJ7nZAV3vXN2ED+ ECHSEF9f751KD04//WyTf3b9ivtP762LgKo4/QpUan/3QR8USCbqH98rBABNkqbVZfZW jxj/ZCx4hb8DKhXVm1jns4ix8y0C9n7HYziidTvF/VMNRJVv3LEhnwb8XrWcEqr2gIqK ohg2//BAo2qeCgPGY1OEOZSU7LsK4cX4BIEwLVDm2XHGHvgONzlnEcrHN1ajtM8Ev2Df 9jdg== X-Gm-Message-State: AOAM533Hc0KZk7Q2Xd0HGFoB4fxg/slViseorToy7x3D+s6itdpb/3vN dlAtzpcYEP8fSeR5BAV8Zrs= X-Google-Smtp-Source: ABdhPJxoPCX31yr+6U+GKJT2eytYYVErrWCMsq+nf1jvEBCuB8LYKRf2OQ7DnGBobtfcAb7fJw8L1A== X-Received: by 2002:a2e:8796:: with SMTP id n22mr12640360lji.15.1591709353929; Tue, 09 Jun 2020 06:29:13 -0700 (PDT) Received: from localhost.localdomain (79-139-237-54.dynamic.spd-mgts.ru. [79.139.237.54]) by smtp.gmail.com with ESMTPSA id s8sm5069821lfc.83.2020.06.09.06.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 06:29:13 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Sam Ravnborg , Laurent Pinchart , Rob Herring , Frank Rowand Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/6] drm/tegra: output: Don't leak OF node on error Date: Tue, 9 Jun 2020 16:28:52 +0300 Message-Id: <20200609132855.20975-4-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200609132855.20975-1-digetx@gmail.com> References: <20200609132855.20975-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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 Reviewed-by: Sam Ravnborg 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 38E05C433DF for ; Wed, 10 Jun 2020 07:37:19 +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 0CBC4207ED for ; Wed, 10 Jun 2020 07:37:19 +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="ZFwKVZmJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CBC4207ED 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 A57646E46E; Wed, 10 Jun 2020 07:36:20 +0000 (UTC) Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FDFD89F85 for ; Tue, 9 Jun 2020 13:29:15 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id y11so23413463ljm.9 for ; Tue, 09 Jun 2020 06:29:15 -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=h/buGMp+Ss9uiUTlhYkjRB/SevbvsV7Suq67TOhl6lM=; b=ZFwKVZmJ8MZiS+yKqDOG1+DhkcEJJCq/2FLEmxlbnI8iOoQ0pvvcX+9WbJnEL4Y07y q0s3iTqppiEmQg/QWgIF1Hh38LG0s+86Y4cCi1NJY325/Lopu1av7FBHu0RuyEhrOCHo v3dI0Ke2MXFFbZRg3xm1m9Rz59DXhcn+5oYzXaLGP99IwsJVaWzk1LYRtIMx3JAKlxrm kfLLc/RO7ZUEDNvYOIatxGVHjr7vO25gfP4ECoZUXDMZ+lR8HkBjTvd6o8LoHd/+Hrs1 tU/p5ClJJIl5wYjdTVXUvPcv6l2IYek75ImnUD/eilhDdAzF1monsFjDZvQzVtl5tt4f HBLA== 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=h/buGMp+Ss9uiUTlhYkjRB/SevbvsV7Suq67TOhl6lM=; b=RvBGUl2mePFnCxy8uIzKcDbb5pyLsH8GDR2Kx0+goUJISgMxXjGja/sOiQ+bTcer/u r2kskczQrllOhRfgQ6Xgd82ogfhfq8JKVshqNX7qk/rnP9H0aRkWmbvAiFXC0LfOloAw NTFXghNqpRWGyUmWLu6rwlfcExeWvYEP8ciVuVAVor8x72DHHyii0uP5FjUuBlVDW/A1 apMlu3Az+kD36qIlk+Q3QS6AElz18ltwiK1FE6nDD+Vj0ufPe7VtjNjkWn/+YS2DAuaG +z8Ff3V4KPK2U5oasYZQLwH+vZz3+LCSP1F1576WEQ7isNvagJcmgCDjNn4REP+oSOdd xHuA== X-Gm-Message-State: AOAM530L02Rpgux61IVDGXdQ7tKL+i3p+eOiPiL7IJtiXJ2uAR28YEGJ X9pCNskT79frKfy0xOvXsgI= X-Google-Smtp-Source: ABdhPJxoPCX31yr+6U+GKJT2eytYYVErrWCMsq+nf1jvEBCuB8LYKRf2OQ7DnGBobtfcAb7fJw8L1A== X-Received: by 2002:a2e:8796:: with SMTP id n22mr12640360lji.15.1591709353929; Tue, 09 Jun 2020 06:29:13 -0700 (PDT) Received: from localhost.localdomain (79-139-237-54.dynamic.spd-mgts.ru. [79.139.237.54]) by smtp.gmail.com with ESMTPSA id s8sm5069821lfc.83.2020.06.09.06.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 06:29:13 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Sam Ravnborg , Laurent Pinchart , Rob Herring , Frank Rowand Subject: [PATCH v6 3/6] drm/tegra: output: Don't leak OF node on error Date: Tue, 9 Jun 2020 16:28:52 +0300 Message-Id: <20200609132855.20975-4-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200609132855.20975-1-digetx@gmail.com> References: <20200609132855.20975-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 10 Jun 2020 07:35:32 +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, devicetree@vger.kernel.org, linux-kernel@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 Reviewed-by: Sam Ravnborg 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