[PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Lin Feng]

The memmove span covers from (next+1) to the end of the array, and the index
of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
array elements is (type->cnt - (i + 2)).

Cc: Tejun Heo <tj@kernel.org>
Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Lin Feng <linfeng@cn.fujitsu.com>
---
ChangeLog v1->v2:
- Add a comment pointed out by Tejun.
---
 mm/memblock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 6259055..88adc8a 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
 		}
 
 		this->size += next->size;
-		memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
+		/* move forward from next + 1, index of which is i + 2 */
+		memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
 		type->cnt--;
 	}
 }
-- 
1.7.11.7

[PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Lin Feng]

The memmove span covers from (next+1) to the end of the array, and the index
of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
array elements is (type->cnt - (i + 2)).

Cc: Tejun Heo <tj@kernel.org>
Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Lin Feng <linfeng@cn.fujitsu.com>
---
ChangeLog v1->v2:
- Add a comment pointed out by Tejun.
---
 mm/memblock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 6259055..88adc8a 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
 		}
 
 		this->size += next->size;
-		memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
+		/* move forward from next + 1, index of which is i + 2 */
+		memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
 		type->cnt--;
 	}
 }
-- 
1.7.11.7

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Tejun Heo]

On Mon, Jan 07, 2013 at 11:41:36AM +0800, Lin Feng wrote:
> The memmove span covers from (next+1) to the end of the array, and the index
> of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
> array elements is (type->cnt - (i + 2)).
> 
> Cc: Tejun Heo <tj@kernel.org>
> Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
> Signed-off-by: Lin Feng <linfeng@cn.fujitsu.com>

Acked-by: Tejun Heo <tj@kernel.org>

Thanks!

-- 
tejun

Re: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Tejun Heo]

On Mon, Jan 07, 2013 at 11:41:36AM +0800, Lin Feng wrote:
> The memmove span covers from (next+1) to the end of the array, and the index
> of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
> array elements is (type->cnt - (i + 2)).
> 
> Cc: Tejun Heo <tj@kernel.org>
> Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
> Signed-off-by: Lin Feng <linfeng@cn.fujitsu.com>

Acked-by: Tejun Heo <tj@kernel.org>

Thanks!

-- 
tejun

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Andrew Morton]

On Mon, 7 Jan 2013 11:41:36 +0800
Lin Feng <linfeng@cn.fujitsu.com> wrote:

> The memmove span covers from (next+1) to the end of the array, and the index
> of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
> array elements is (type->cnt - (i + 2)).

What are the user-visible effects of this bug?

> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
>  		}
>  
>  		this->size += next->size;
> -		memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
> +		/* move forward from next + 1, index of which is i + 2 */
> +		memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
>  		type->cnt--;
>  	}
>  }
> -- 
> 1.7.11.7

Re: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Andrew Morton]

On Mon, 7 Jan 2013 11:41:36 +0800
Lin Feng <linfeng@cn.fujitsu.com> wrote:

> The memmove span covers from (next+1) to the end of the array, and the index
> of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
> array elements is (type->cnt - (i + 2)).

What are the user-visible effects of this bug?

> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
>  		}
>  
>  		this->size += next->size;
> -		memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
> +		/* move forward from next + 1, index of which is i + 2 */
> +		memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
>  		type->cnt--;
>  	}
>  }
> -- 
> 1.7.11.7

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Lin Feng]

On 01/08/2013 05:23 AM, Andrew Morton wrote:
> On Mon, 7 Jan 2013 11:41:36 +0800
> Lin Feng <linfeng@cn.fujitsu.com> wrote:
> 
>> The memmove span covers from (next+1) to the end of the array, and the index
>> of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
>> array elements is (type->cnt - (i + 2)).
> 
> What are the user-visible effects of this bug?
Hi Andrew,

Since the remaining elements of the memblock array are move forward by one
element and there is only one additional element caused by this bug. 
So there won't be any write overflow here but read overflow. 
It may read one more element out of the array address if the array happens
to be full. Commonly it doesn't matter at all but if the array happens to
be located at the end a memblock, it may cause a invalid read operation
for the physical address doesn't exist. 

There are 2 *happens to be* here, so I think the probability is quite low,
I don't know if any guy is haunted by this bug before. 

Mostly I think it's user-invisible.

thanks,
linfeng
> 
>> --- a/mm/memblock.c
>> +++ b/mm/memblock.c
>> @@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
>>  		}
>>  
>>  		this->size += next->size;
>> -		memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
>> +		/* move forward from next + 1, index of which is i + 2 */
>> +		memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
>>  		type->cnt--;
>>  	}
>>  }
>> -- 
>> 1.7.11.7
> 

Re: [PATCH v2] mm: memblock: fix wrong memmove size in memblock_merge_regions()

[Lin Feng]

On 01/08/2013 05:23 AM, Andrew Morton wrote:
> On Mon, 7 Jan 2013 11:41:36 +0800
> Lin Feng <linfeng@cn.fujitsu.com> wrote:
> 
>> The memmove span covers from (next+1) to the end of the array, and the index
>> of next is (i+1), so the index of (next+1) is (i+2). So the size of remaining
>> array elements is (type->cnt - (i + 2)).
> 
> What are the user-visible effects of this bug?
Hi Andrew,

Since the remaining elements of the memblock array are move forward by one
element and there is only one additional element caused by this bug. 
So there won't be any write overflow here but read overflow. 
It may read one more element out of the array address if the array happens
to be full. Commonly it doesn't matter at all but if the array happens to
be located at the end a memblock, it may cause a invalid read operation
for the physical address doesn't exist. 

There are 2 *happens to be* here, so I think the probability is quite low,
I don't know if any guy is haunted by this bug before. 

Mostly I think it's user-invisible.

thanks,
linfeng
> 
>> --- a/mm/memblock.c
>> +++ b/mm/memblock.c
>> @@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
>>  		}
>>  
>>  		this->size += next->size;
>> -		memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
>> +		/* move forward from next + 1, index of which is i + 2 */
>> +		memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
>>  		type->cnt--;
>>  	}
>>  }
>> -- 
>> 1.7.11.7
> 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>