aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-08-27 04:21:46 -0400
committerRob Herring <robh@kernel.org>2018-10-23 14:19:58 -0400
commitceff2f4dcd44abf35864d9a99f85ac619e89a01d (patch)
treefd74d5204ed643fed7316af8001bd08cb0ed0f6c
parent173ee3962959a1985a109f81539a403b5cd07ae7 (diff)
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: 8f83f26891e1 ("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: Johan Hovold <johan@kernel.org> Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--drivers/gpu/drm/mediatek/mtk_hdmi.c5
1 files 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,
1446 } 1446 }
1447 1447
1448 /* The CEC module handles HDMI hotplug detection */ 1448 /* The CEC module handles HDMI hotplug detection */
1449 cec_np = of_find_compatible_node(np->parent, NULL, 1449 cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");
1450 "mediatek,mt8173-cec");
1451 if (!cec_np) { 1450 if (!cec_np) {
1452 dev_err(dev, "Failed to find CEC node\n"); 1451 dev_err(dev, "Failed to find CEC node\n");
1453 return -EINVAL; 1452 return -EINVAL;
@@ -1457,8 +1456,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
1457 if (!cec_pdev) { 1456 if (!cec_pdev) {
1458 dev_err(hdmi->dev, "Waiting for CEC device %pOF\n", 1457 dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
1459 cec_np); 1458 cec_np);
1459 of_node_put(cec_np);
1460 return -EPROBE_DEFER; 1460 return -EPROBE_DEFER;
1461 } 1461 }
1462 of_node_put(cec_np);
1462 hdmi->cec_dev = &cec_pdev->dev; 1463 hdmi->cec_dev = &cec_pdev->dev;
1463 1464
1464 /* 1465 /*