Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Johan Hovold and committed by
Rob Herring
5bf59773 ac63043d

+2 -3
+2 -3
drivers/nfc/nfcmrvl/uart.c
··· 73 73 struct device_node *matched_node; 74 74 int ret; 75 75 76 - matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart"); 76 + matched_node = of_get_compatible_child(node, "marvell,nfc-uart"); 77 77 if (!matched_node) { 78 - matched_node = of_find_compatible_node(node, NULL, 79 - "mrvl,nfc-uart"); 78 + matched_node = of_get_compatible_child(node, "mrvl,nfc-uart"); 80 79 if (!matched_node) 81 80 return -ENODEV; 82 81 }