Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1268054

Re: [PATCH] mm: vmalloc: don't remove inexistent guard hole in remove_vm_area()

Show all headers | View raw

2015-11-12 18:17 GMT+03:00 Jerome Marchand <jmarchan@redhat.com>:
> Commit 71394fe50146 ("mm: vmalloc: add flag preventing guard hole
> allocation") missed a spot. Currently remove_vm_area() decreases
> vm->size to remove the guard hole page, even when it isn't present.
> This patch only decreases vm->size when VM_NO_GUARD isn't set.
>
> Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
> ---
>  mm/vmalloc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index d045634..1388c3d 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -1443,7 +1443,8 @@ struct vm_struct *remove_vm_area(const void *addr)
>                 vmap_debug_free_range(va->va_start, va->va_end);
>                 kasan_free_shadow(vm);
>                 free_unmap_vmap_area(va);
> -               vm->size -= PAGE_SIZE;
> +               if (!(vm->flags & VM_NO_GUARD))
> +                       vm->size -= PAGE_SIZE;
>

I'd fix this in another way. I think that remove_vm_area() shouldn't
change vm's size, IMO it doesn't make sense.
The only caller who cares about vm's size after removing is __vunmap():
         area = remove_vm_area(addr);
         ....
         debug_check_no_locks_freed(addr, area->size);
         debug_check_no_obj_freed(addr, area->size);

We already have proper get_vm_area_size() helper which takes
VM_NO_GUARD into account.
So I think we should use that helper for debug_check_no_*() and just
remove 'vm->size -= PAGE_SIZE;' line
from remove_vm_area()



>                 return vm;
>         }
> --
> 2.4.3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] mm: vmalloc: don't remove inexistent guard hole in remove_vm_area() "Jerome Marchand" <jmarchan@redhat.com> - 2015-11-12 16:20 +0100
  Re: [PATCH] mm: vmalloc: don't remove inexistent guard hole in remove_vm_area() Andrey Ryabinin <ryabinin.a.a@gmail.com> - 2015-11-12 17:00 +0100
    Re: [PATCH] mm: vmalloc: don't remove inexistent guard hole in  remove_vm_area() Jerome Marchand <jmarchan@redhat.com> - 2015-11-12 17:30 +0100
  [PATCH V2] mm: vmalloc: don't remove inexistent guard hole in remove_vm_area() "Jerome Marchand" <jmarchan@redhat.com> - 2015-11-12 17:40 +0100
    Re: [PATCH V2] mm: vmalloc: don't remove inexistent guard hole in remove_vm_area() Andrey Ryabinin <ryabinin.a.a@gmail.com> - 2015-11-12 19:50 +0100
    Re: [PATCH V2] mm: vmalloc: don't remove inexistent guard hole in  remove_vm_area() David Rientjes <rientjes@google.com> - 2015-11-12 22:00 +0100

csiph-web