From: Johan Hovold <johan@kernel.org>
To: gregkh@linuxfoundation.org
Cc: johan@kernel.org, airlied@linux.ie, ck.hu@mediatek.com,
junzhi.zhao@mediatek.com, p.zabel@pengutronix.de,
robh@kernel.org, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] drm/mediatek: fix OF sibling-node lookup" failed to apply to 4.9-stable tree
Date: Tue, 27 Nov 2018 07:16:56 -0800 [thread overview]
Message-ID: <20181127151656.GP2403@localhost> (raw)
In-Reply-To: <154195306014367@kroah.com>
On Sun, Nov 11, 2018 at 08:17:40AM -0800, Greg Kroah-Hartman wrote:
>
> The patch below does not apply to the 4.9-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
This one also depends on
36156f9241cb ("of: add helper to lookup compatible child node")
Johan
> ------------------ original commit in Linus's tree ------------------
>
> From ceff2f4dcd44abf35864d9a99f85ac619e89a01d Mon Sep 17 00:00:00 2001
> From: Johan Hovold <johan@kernel.org>
> Date: Mon, 27 Aug 2018 10:21:46 +0200
> Subject: [PATCH] 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>
>
> 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;
>
> /*
>
next prev parent reply other threads:[~2018-11-28 2:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-11 16:17 FAILED: patch "[PATCH] drm/mediatek: fix OF sibling-node lookup" failed to apply to 4.9-stable tree gregkh
2018-11-27 15:16 ` Johan Hovold [this message]
2018-11-28 15:22 ` Sasha Levin
2018-12-05 6:47 ` Johan Hovold
2018-12-06 10:40 ` Greg KH
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=20181127151656.GP2403@localhost \
--to=johan@kernel.org \
--cc=airlied@linux.ie \
--cc=ck.hu@mediatek.com \
--cc=gregkh@linuxfoundation.org \
--cc=junzhi.zhao@mediatek.com \
--cc=p.zabel@pengutronix.de \
--cc=robh@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.