diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-16 15:14:38 +0000 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-11-20 22:58:53 -0600 |
| commit | 0fca5deafeac764c2ab0d37c2409fdd0962d5724 (patch) | |
| tree | 3886c78f4b5058b52b6f043e1b25b804297bd839 /drivers | |
| parent | 6872a3173501f16aee5ce160359d1bb513d06a59 (diff) | |
| download | linux-stable-0fca5deafeac764c2ab0d37c2409fdd0962d5724.tar.gz linux-stable-0fca5deafeac764c2ab0d37c2409fdd0962d5724.tar.bz2 linux-stable-0fca5deafeac764c2ab0d37c2409fdd0962d5724.zip | |
of/fdt: NULL-terminate the root node path
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/fdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 135b8083212a..e36ff40011f4 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -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' |