Commit a46d9884 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Michael Ellerman

powerpc/pseries: handle nodes without '/'

In case we have node without '/' strrchr() returns NULL which might lead to
crash. Replace strrchr() by kbasename() and modify condition to avoid such
behaviour.
Suggested-by: default avatarSegher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a030e1e4
...@@ -17,14 +17,14 @@ struct device_node *pseries_of_derive_parent(const char *path) ...@@ -17,14 +17,14 @@ struct device_node *pseries_of_derive_parent(const char *path)
{ {
struct device_node *parent; struct device_node *parent;
char *parent_path = "/"; char *parent_path = "/";
size_t parent_path_len = strrchr(path, '/') - path + 1; const char *tail = kbasename(path);
/* reject if path is "/" */ /* reject if path is "/" */
if (!strcmp(path, "/")) if (!strcmp(path, "/"))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (strrchr(path, '/') != path) { if (tail > path + 1) {
parent_path = kstrndup(path, parent_path_len, GFP_KERNEL); parent_path = kstrndup(path, tail - path, GFP_KERNEL);
if (!parent_path) if (!parent_path)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment