lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 303/350] drm/mediatek: fix OF sibling-node lookup
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit ceff2f4dcd44abf35864d9a99f85ac619e89a01d upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/mediatek/mtk_hdmi.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- 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(struc
    }

    /* 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(struc
    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;

    /*

    \
     
     \ /
      Last update: 2018-11-12 00:17    [W:2.157 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site