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

Groups > linux.kernel > #1411212

[PATCH 1/6] x86/vdso: unmap vdso blob on vvar mapping failure

Show all headers | View raw

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

Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
---
 arch/x86/entry/vdso/vma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index 3329844e3c43..387028e6755d 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -238,7 +238,7 @@ 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:
-- 
2.8.2

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

Thread

[PATCH 0/6] x86: 32-bit compatible C/R on x86_64 Dmitry Safonov <dsafonov@virtuozzo.com> - 2016-06-01 15:20 +0200
  [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Dmitry Safonov <dsafonov@virtuozzo.com> - 2016-06-01 15:20 +0200
    Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Cyrill Gorcunov <gorcunov@gmail.com> - 2016-06-03 12:00 +0200
      Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Cyrill Gorcunov <gorcunov@gmail.com> - 2016-06-03 12:50 +0200
    Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Oleg Nesterov <oleg@redhat.com> - 2016-06-07 00:30 +0200
      Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Dmitry Safonov <dsafonov@virtuozzo.com> - 2016-06-07 13:40 +0200
      Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Andy Lutomirski <luto@amacapital.net> - 2016-06-09 19:30 +0200
        Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Oleg Nesterov <oleg@redhat.com> - 2016-06-10 22:10 +0200
          Re: [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Andy Lutomirski <luto@amacapital.net> - 2016-06-10 22:20 +0200
  [PATCH 1/6] x86/vdso: unmap vdso blob on vvar mapping failure Dmitry Safonov <dsafonov@virtuozzo.com> - 2016-06-01 15:20 +0200
  [PATCH 3/6] x86/arch_prctl/vdso: add ARCH_MAP_VDSO_* Dmitry Safonov <dsafonov@virtuozzo.com> - 2016-06-01 15:20 +0200

csiph-web