diff options
| -rw-r--r-- | mm/vmalloc.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 43b264efe6b7..1b585ad47fa5 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -256,20 +256,22 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, align = 1ul << bit; } addr = ALIGN(start, align); + size = PAGE_ALIGN(size); area = kmalloc(sizeof(*area), GFP_KERNEL); if (unlikely(!area)) return NULL; - /* - * We always allocate a guard page. - */ - size += PAGE_SIZE; if (unlikely(!size)) { kfree (area); return NULL; } + /* + * We always allocate a guard page. + */ + size += PAGE_SIZE; + write_lock(&vmlist_lock); for (p = &vmlist; (tmp = *p) != NULL ;p = &tmp->next) { if ((unsigned long)tmp->addr < addr) { @@ -349,6 +351,11 @@ found: unmap_vm_area(tmp); *p = tmp->next; write_unlock(&vmlist_lock); + + /* + * Remove the guard page. + */ + tmp->size -= PAGE_SIZE; return tmp; } |