Commit ceff2f4d authored by Johan Hovold's avatar Johan Hovold Committed by Rob Herring

drm/mediatek: fix OF sibling-node lookup

Use the new of_get_compatible_child() helper to lookup the sibling
instead of using of_find_compatible_node(), which searches the entire
tree from a given start node 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: 8f83f268 ("drm/mediatek: Add HDMI support")
Cc: stable <stable@vger.kernel.org>     # 4.8
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: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 173ee396
...@@ -1446,8 +1446,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, ...@@ -1446,8 +1446,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
} }
/* The CEC module handles HDMI hotplug detection */ /* The CEC module handles HDMI hotplug detection */
cec_np = of_find_compatible_node(np->parent, NULL, cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");
"mediatek,mt8173-cec");
if (!cec_np) { if (!cec_np) {
dev_err(dev, "Failed to find CEC node\n"); dev_err(dev, "Failed to find CEC node\n");
return -EINVAL; return -EINVAL;
...@@ -1457,8 +1456,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, ...@@ -1457,8 +1456,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
if (!cec_pdev) { if (!cec_pdev) {
dev_err(hdmi->dev, "Waiting for CEC device %pOF\n", dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
cec_np); cec_np);
of_node_put(cec_np);
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
of_node_put(cec_np);
hdmi->cec_dev = &cec_pdev->dev; hdmi->cec_dev = &cec_pdev->dev;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment