powerpc: Make sure device node type/name is not NULL

PATCH New Benjamin Herrenschmidt 1 participant 1 message May 16, 2007 PowerPC

Share & tools

Benjamin Herrenschmidt

author

2007-05-16 06:57 UTC #0 lore raw

PATCH 1/1 powerpc: Make sure device node type/name is not NULL

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 <[email protected]>

---

 arch/powerpc/kernel/prom.c |    5 +++++
 1 file changed, 5 insertions(+)

arch/powerpc/kernel/prom.c +5 -0

Index: linux-cell/arch/powerpc/kernel/prom.c
===================================================================
@@ -1472,6 +1472,11 @@ static int of_finish_dynamic_node(struct
 	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;