Skip to content

Commit

Permalink
[POWERPC] Make sure device node type/name is not NULL on hot-added nodes
Browse files Browse the repository at this point in the history
Our device-tree unflattening code makes sure the name and type fields
of a device-node are not NULL. However, the code for dynamically
adding devices nodes which is used for pSeries hotplug for example
didn't do it, potentially causing crashes in some code that assume it
can always do things like strcmp on those.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed May 17, 2007
1 parent c72ea77 commit 847f597
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1472,6 +1472,11 @@ static int of_finish_dynamic_node(struct device_node *node)
node->name = of_get_property(node, "name", NULL);
node->type = of_get_property(node, "device_type", NULL);

if (!node->name)
node->name = "<NULL>";
if (!node->type)
node->type = "<NULL>";

if (!parent) {
err = -ENODEV;
goto out;
Expand Down

0 comments on commit 847f597

Please sign in to comment.