Re: [PATCH] of/fdt: fix allocation size for device node path

From: Rob Herring
Date: Wed Apr 15 2015 - 09:00:33 EST


On Wed, Apr 15, 2015 at 7:15 AM, Grant Likely <grant.likely@xxxxxxxxxx> wrote:
> On Tue, 14 Apr 2015 12:36:05 +0800
> , Ricky Liang <jcliang@xxxxxxxxxxxx>
> wrote:
>> The allocation size of device node path is off by one which drops the
>> '\0' terminator.
>>
>> Signed-off-by: Ricky Liang <jcliang@xxxxxxxxxxxx>
>
> This looks like something that should be backported to stable. Do you agree?

I've applied, but didn't tag it. I'll send it for stable once it is in
Linus' tree.

BTW, it only affects old dtb versions less than 0x10 because allocl is
overwritten in the 'if' statement just below here.

Rob

>
> g.
>
>> ---
>> drivers/of/fdt.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
>> index 3a896c9..98a9e6e 100644
>> --- a/drivers/of/fdt.c
>> +++ b/drivers/of/fdt.c
>> @@ -172,7 +172,7 @@ static void * unflatten_dt_node(void *blob,
>> if (!pathp)
>> return mem;
>>
>> - allocl = l++;
>> + allocl = ++l;
>>
>> /* version 0x10 has a more compact unit name here instead of the full
>> * path. we accumulate the full path size using "fpsize", we'll rebuild
>> --
>> 2.1.2
>>
>
--
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/