diff --git a/[refs] b/[refs] index 0a7133bc26d2..595e30b1964c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7f75e25860ac0a7b70cf6e14c37618d2d2bb890 +refs/heads/master: 5dc331852848a38ca00a2817e5b98a1d0561b116 diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 4efc41a6e2ab..0536dde139d1 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -254,6 +254,10 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl if (addr > end - size) goto out; } + if ((size + addr) < addr) + goto out; + if (addr > end - size) + goto out; found: area->next = *p;