Commit e38447ee authored Sep 05, 2016 by Dmitry Safonov Committed by Thomas Gleixner Sep 14, 2016

x86/vdso: Unmap vdso blob on vvar mapping failure



If remapping of vDSO blob failed on vvar mapping,
we need to unmap previously mapped vDSO blob.

Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: 0x7f454c46@gmail.com
Cc: oleg@redhat.com
Cc: linux-mm@kvack.org
Cc: gorcunov@openvz.org
Cc: xemul@virtuozzo.com
Link: http://lkml.kernel.org/r/20160905133308.28234-2-dsafonov@virtuozzo.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 9395452b

arch/x86/entry/vdso/vma.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;