lkml.org 
[lkml]   [2016]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv5 1/6] x86/vdso: unmap vdso blob on vvar mapping failure
    Date
    If remapping of vDSO blob failed on vvar mapping,
    we need to unmap previously mapped vDSO blob.

    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: linux-mm@kvack.org
    Cc: x86@kernel.org
    Cc: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Pavel Emelyanov <xemul@virtuozzo.com>
    Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
    Acked-by: Andy Lutomirski <luto@kernel.org>
    ---
    arch/x86/entry/vdso/vma.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
    index f840766659a8..3bab6ba3ffc5 100644
    --- a/arch/x86/entry/vdso/vma.c
    +++ b/arch/x86/entry/vdso/vma.c
    @@ -238,12 +238,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)

    if (IS_ERR(vma)) {
    ret = PTR_ERR(vma);
    - goto up_fail;
    + do_munmap(mm, text_start, image->size);
    }

    up_fail:
    - if (ret)
    + if (ret) {
    current->mm->context.vdso = NULL;
    + current->mm->context.vdso_image = NULL;
    + }

    up_write(&mm->mmap_sem);
    return ret;
    --
    2.9.0
    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:2.580 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site