All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: Rob Herring <robh+dt@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Frank Rowand <frowand.list@gmail.com>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan@kernel.org>, stable <stable@vger.kernel.org>,
	Vincent Cuissard <cuissard@marvell.com>,
	Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH v2 8/9] NFC: nfcmrvl_uart: fix OF child-node lookup
Date: Mon, 27 Aug 2018 10:21:52 +0200	[thread overview]
Message-ID: <20180827082153.22537-9-johan@kernel.org> (raw)
In-Reply-To: <20180827082153.22537-1-johan@kernel.org>

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>
---
 drivers/nfc/nfcmrvl/uart.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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;
 	}
-- 
2.18.0

  parent reply	other threads:[~2018-08-27  8:21 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-27  8:21 [PATCH v2 0/9] of: fix compatible-child-node lookups Johan Hovold
2018-08-27  8:21 ` [PATCH v2 1/9] of: add helper to lookup compatible child node Johan Hovold
2018-08-30 15:51   ` Rob Herring
2018-08-27  8:21 ` [PATCH v2 2/9] drm/mediatek: fix OF sibling-node lookup Johan Hovold
2018-08-27  8:21 ` [PATCH v2 3/9] drm/msm: fix OF child-node lookup Johan Hovold
2018-08-27  8:21 ` [PATCH v2 4/9] mmc: meson-mx-sdio: " Johan Hovold
2018-08-27 14:44   ` Ulf Hansson
2018-09-04 12:54     ` Johan Hovold
2018-09-05  6:30       ` Ulf Hansson
2018-08-27  8:21 ` [PATCH v2 5/9] mtd: nand: atmel: " Johan Hovold
2018-08-27  8:28   ` Boris Brezillon
2018-08-27  8:44     ` Johan Hovold
2018-08-27  8:48       ` Boris Brezillon
2018-08-27  9:44         ` Johan Hovold
2018-10-23 18:28           ` Rob Herring
2018-10-23 18:51             ` Boris Brezillon
2018-11-15 14:26               ` Johan Hovold
2018-11-18 10:45                 ` Boris Brezillon
2018-08-27  8:21 ` [PATCH v2 6/9] net: bcmgenet: " Johan Hovold
2018-08-31  0:47   ` Florian Fainelli
2018-09-04 12:56     ` Johan Hovold
2018-08-27  8:21 ` [PATCH v2 7/9] net: stmmac: dwmac-sun8i: " Johan Hovold
2018-08-28  8:06   ` Corentin Labbe
2018-08-29  7:54     ` Johan Hovold
2018-09-06 20:03   ` Corentin Labbe
2018-09-07  7:48     ` Johan Hovold
2018-08-27  8:21 ` Johan Hovold [this message]
2018-08-27  8:21 ` [PATCH v2 9/9] power: supply: twl4030-charger: fix OF sibling-node lookup Johan Hovold
2018-09-04 13:05 ` [PATCH v2 0/9] of: fix compatible-child-node lookups Johan Hovold
2018-10-23  9:19   ` Johan Hovold
2018-10-23 18:32     ` Rob Herring
2018-10-23 18:32       ` Rob Herring
2018-10-24  7:32       ` Johan Hovold
2018-10-24  7:32         ` Johan Hovold

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=20180827082153.22537-9-johan@kernel.org \
    --to=johan@kernel.org \
    --cc=cuissard@marvell.com \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh+dt@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 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.