Explorar el Código

[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>
Benjamin Herrenschmidt hace 18 años
padre
commit
847f5976f9
Se han modificado 1 ficheros con 5 adiciones y 0 borrados
  1. 5 0
      arch/powerpc/kernel/prom.c

+ 5 - 0
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;