Skip to content

Commit 29c4a54

Browse files
andy-shevgregkh
authored andcommitted
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: 114dbb4 ("drivers property: When no children in primary, try secondary") Reported-by: Maxim Levitsky <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]> Tested-by: Maxim Levitsky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ba47d84 commit 29c4a54

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/base/property.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev,
721721
return next;
722722

723723
/* When no more children in primary, continue with secondary */
724-
if (!IS_ERR_OR_NULL(fwnode->secondary))
724+
if (fwnode && !IS_ERR_OR_NULL(fwnode->secondary))
725725
next = fwnode_get_next_child_node(fwnode->secondary, child);
726726

727727
return next;

0 commit comments

Comments
 (0)