device property: Avoid NULL pointer dereference in device_get_next_child_node()

When we have no primary fwnode or when it's a software node, we may end up
in the situation when fwnode is a NULL pointer. There is no point to look for
secondary fwnode in such case. Add a necessary check to a condition.

Fixes: 1d20179d76d5 ("drivers property: When no children in primary, try secondary")
Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Maxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20200716182747.54929-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 1e6d75e65938fb8247c66adb3baa6181f8058920..d58aa98fe9645703b5be22c16d89241f663600a5 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -721,7 +721,7 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev,
                return next;
 
        /* When no more children in primary, continue with secondary */
-       if (!IS_ERR_OR_NULL(fwnode->secondary))
+       if (fwnode && !IS_ERR_OR_NULL(fwnode->secondary))
                next = fwnode_get_next_child_node(fwnode->secondary, child);
 
        return next;