]> Pileus Git - ~andy/linux/commitdiff
of/fdt: NULL-terminate the root node path
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 16 Nov 2012 15:14:38 +0000 (15:14 +0000)
committerRob Herring <rob.herring@calxeda.com>
Wed, 21 Nov 2012 04:58:53 +0000 (22:58 -0600)
Commit 509b7455 (of/fdt: Don't copy garbage after "/" in root node path)
sets the path length to 0 to ignore any garbage after "/" in the root
node path. This has the side effect of also ignoring '\0' at the end of
the root node path. This patch sets the ignores the garbage by setting
the last character to '\0' and length to 1.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
drivers/of/fdt.c

index 135b8083212add001b4384db964b3ba879897649..e36ff40011f4449ecceece7c89f2b1f1278fceb7 100644 (file)
@@ -186,7 +186,8 @@ static unsigned long unflatten_dt_node(struct boot_param_header *blob,
                         */
                        fpsize = 1;
                        allocl = 2;
-                       l = 0;
+                       l = 1;
+                       *pathp = '\0';
                } else {
                        /* account for '/' and path size minus terminal 0
                         * already in 'l'