devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: Rob Herring <robh+dt@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Frank Rowand <frowand.list@gmail.com>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan@kernel.org>, stable <stable@vger.kernel.org>,
	Jie Qiu <jie.qiu@mediatek.com>,
	Junzhi Zhao <junzhi.zhao@mediatek.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	CK Hu <ck.hu@mediatek.com>, David Airlie <airlied@linux.ie>
Subject: [PATCH 2/9] drm/mediatek: fix OF sibling-node lookup
Date: Wed, 22 Aug 2018 12:55:40 +0200	[thread overview]
Message-ID: <20180822105547.9634-3-johan@kernel.org> (raw)
In-Reply-To: <20180822105547.9634-1-johan@kernel.org>

Use the new of_get_compatible_child() helper to lookup the sibling
instead of using of_find_compatible_node(), which searches the entire
tree and thus can return an unrelated (i.e. non-sibling) node.

This also addresses a potential use-after-free (e.g. after probe
deferral) as the tree-wide helper drops a reference to its first
argument (i.e. the parent device node).

While at it, also fix the related cec-node reference leak.

Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support")
Cc: stable <stable@vger.kernel.org>     # 4.8
Cc: Jie Qiu <jie.qiu@mediatek.com>
Cc: Junzhi Zhao <junzhi.zhao@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/gpu/drm/mediatek/mtk_hdmi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 2d45d1dd9554..643f5edd68fe 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1446,8 +1446,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
 	}
 
 	/* The CEC module handles HDMI hotplug detection */
-	cec_np = of_find_compatible_node(np->parent, NULL,
-					 "mediatek,mt8173-cec");
+	cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");
 	if (!cec_np) {
 		dev_err(dev, "Failed to find CEC node\n");
 		return -EINVAL;
@@ -1457,8 +1456,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
 	if (!cec_pdev) {
 		dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
 			cec_np);
+		of_node_put(cec_np);
 		return -EPROBE_DEFER;
 	}
+	of_node_put(cec_np);
 	hdmi->cec_dev = &cec_pdev->dev;
 
 	/*
-- 
2.18.0

  parent reply	other threads:[~2018-08-22 10:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-22 10:55 [PATCH 0/9] of: fix compatible-child-node lookups Johan Hovold
2018-08-22 10:55 ` [PATCH 1/9] of: add helper to lookup compatible child node Johan Hovold
2018-08-23  3:17   ` kbuild test robot
2018-08-23  7:39     ` Johan Hovold
2018-08-22 10:55 ` Johan Hovold [this message]
2018-08-22 10:55 ` [PATCH 3/9] drm/msm: fix OF child-node lookup Johan Hovold
2018-08-22 14:41   ` Rob Herring
2018-08-22 10:55 ` [PATCH 4/9] mmc: meson-mx-sdio: " Johan Hovold
2018-08-23 18:50   ` Martin Blumenstingl
2018-08-24  6:41     ` Johan Hovold
2018-08-22 10:55 ` [PATCH 5/9] mtd: nand: atmel: " Johan Hovold
2018-08-22 10:55 ` [PATCH 6/9] net: bcmgenet: " Johan Hovold
2018-08-22 10:55 ` [PATCH 7/9] net: stmmac: dwmac-sun8i: " Johan Hovold
2018-08-22 10:55 ` [PATCH 8/9] NFC: nfcmrvl_uart: " Johan Hovold
2018-08-22 10:55 ` [PATCH 9/9] power: supply: twl4030-charger: fix OF sibling-node lookup Johan Hovold
2018-08-22 21:36   ` Sebastian Reichel
2018-08-23  7:40     ` Johan Hovold
2018-08-22 14:32 ` [PATCH 0/9] of: fix compatible-child-node lookups Rob Herring
2018-08-22 14:46   ` Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180822105547.9634-3-johan@kernel.org \
    --to=johan@kernel.org \
    --cc=airlied@linux.ie \
    --cc=ck.hu@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jie.qiu@mediatek.com \
    --cc=junzhi.zhao@mediatek.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=robh+dt@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).