From: Johan Hovold <johan@kernel.org>
To: gregkh@linuxfoundation.org
Cc: johan@kernel.org, cuissard@marvell.com, robh@kernel.org,
sameo@linux.intel.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] NFC: nfcmrvl_uart: fix OF child-node lookup" failed to apply to 4.9-stable tree
Date: Tue, 27 Nov 2018 07:15:28 -0800 [thread overview]
Message-ID: <20181127151528.GK2403@localhost> (raw)
In-Reply-To: <15419462775479@kroah.com>
On Sun, Nov 11, 2018 at 06:24:37AM -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 5bf59773aaf36dd62117dc83d50e1bbf9ef432da Mon Sep 17 00:00:00 2001
> From: Johan Hovold <johan@kernel.org>
> Date: Mon, 27 Aug 2018 10:21:52 +0200
> Subject: [PATCH] NFC: nfcmrvl_uart: fix OF child-node lookup
>
> Use the new of_get_compatible_child() helper to lookup the nfc child
> node 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-child) 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 node).
>
> Fixes: e097dc624f78 ("NFC: nfcmrvl: add UART driver")
> Fixes: d8e018c0b321 ("NFC: nfcmrvl: update device tree bindings for Marvell NFC")
> Cc: stable <stable@vger.kernel.org> # 4.2
> Cc: Vincent Cuissard <cuissard@marvell.com>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> Signed-off-by: Rob Herring <robh@kernel.org>
>
> diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
> index 91162f8e0366..9a22056e8d9e 100644
> --- a/drivers/nfc/nfcmrvl/uart.c
> +++ b/drivers/nfc/nfcmrvl/uart.c
> @@ -73,10 +73,9 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
> struct device_node *matched_node;
> int ret;
>
> - matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart");
> + matched_node = of_get_compatible_child(node, "marvell,nfc-uart");
> if (!matched_node) {
> - matched_node = of_find_compatible_node(node, NULL,
> - "mrvl,nfc-uart");
> + matched_node = of_get_compatible_child(node, "mrvl,nfc-uart");
> if (!matched_node)
> return -ENODEV;
> }
>
next prev parent reply other threads:[~2018-11-28 2:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-11 14:24 FAILED: patch "[PATCH] NFC: nfcmrvl_uart: fix OF child-node lookup" failed to apply to 4.9-stable tree gregkh
2018-11-27 15:15 ` Johan Hovold [this message]
2018-11-28 15:07 ` Sasha Levin
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=20181127151528.GK2403@localhost \
--to=johan@kernel.org \
--cc=cuissard@marvell.com \
--cc=gregkh@linuxfoundation.org \
--cc=robh@kernel.org \
--cc=sameo@linux.intel.com \
--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