Re: [PATCH] of/fdt: NULL-terminate the root node path

[Rob Herring]

On 11/16/2012 09:16 AM, Catalin Marinas wrote:
> On Fri, Nov 16, 2012 at 03:14:38PM +0000, Catalin Marinas wrote:
>> From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> 
> Ah, this shouldn't have been here. git commit -c set the author as well.

I'll fix that and apply. Thanks.

Rob

> 
>> 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@xxxxxxx>
>> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
>> Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
>> ---
>>
>> The patch is against linux-next, not sure whether mainline will get the
>> same commit number. Please feel free to fold it into the original patch,
>> whichever is easier. Without this I can't boot arm64, doesn't populate
>> the platform devices.
>>
>>  drivers/of/fdt.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
>> index 73fb8c0..d9b2207 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'
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/