diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-05-16 16:57:24 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-17 21:11:15 +1000 |
| commit | 847f5976f90d5637a86a826c1c594091d08f3156 (patch) | |
| tree | 5226c33114ee798626a870e4de14c4c10bd31fba | |
| parent | c72ea777d4e51435388fbd863c813a19635fa8ef (diff) | |
| download | op-kernel-dev-847f5976f90d5637a86a826c1c594091d08f3156.zip op-kernel-dev-847f5976f90d5637a86a826c1c594091d08f3156.tar.gz | |
[POWERPC] Make sure device node type/name is not NULL on hot-added nodes
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>
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index c065b55..066a6a7 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -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; |
