]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
software node: Let args be NULL in software_node_get_reference_args
authorSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 9 Nov 2023 10:10:09 +0000 (12:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 22:52:51 +0000 (14:52 -0800)
[ Upstream commit 1eaea4b3604eb9ca7d9a1e73d88fc121bb4061f5 ]

fwnode_get_property_reference_args() may not be called with args argument
NULL and while OF already supports this. Add the missing NULL check.

The purpose is to be able to count the references.

Fixes: b06184acf751 ("software node: Add software_node_get_reference_args()")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20231109101010.1329587-3-sakari.ailus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/base/swnode.c

index 3ba1232ce8451b455e32ae087a2db3a775ad1547..15f149fc19401598089ef5791c57d69858987d36 100644 (file)
@@ -547,6 +547,9 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
        if (nargs > NR_FWNODE_REFERENCE_ARGS)
                return -EINVAL;
 
+       if (!args)
+               return 0;
+
        args->fwnode = software_node_get(refnode);
        args->nargs = nargs;