NFC: nfcmrvl_uart: fix OF child-node lookup

BugLink: https://bugs.launchpad.net/bugs/1836802
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 91162f8e0366c87ab7d3e26f2f02344599fb100b..9a22056e8d9eea921b59a588318be8c47b6b1046 100644 (file)
--- 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;
        }