Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9e1cdc8 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

NFC: nfcmrvl_uart: fix OF child-node lookup 



commit 5bf59773aaf36dd62117dc83d50e1bbf9ef432da upstream.

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: e097dc62 ("NFC: nfcmrvl: add UART driver")
Fixes: d8e018c0 ("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: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6d2e202

drivers/nfc/nfcmrvl/uart.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

	}