All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Safonov <dsafonov@virtuozzo.com>
To: linux-kernel@vger.kernel.org
Cc: 0x7f454c46@gmail.com, linux-mm@kvack.org, mingo@redhat.com,
	luto@amacapital.net, gorcunov@openvz.org, xemul@virtuozzo.com,
	oleg@redhat.com, Dmitry Safonov <dsafonov@virtuozzo.com>,
	Andy Lutomirski <luto@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	x86@kernel.org
Subject: [PATCHv2 1/6] x86/vdso: unmap vdso blob on vvar mapping failure
Date: Wed, 29 Jun 2016 13:57:31 +0300	[thread overview]
Message-ID: <20160629105736.15017-2-dsafonov@virtuozzo.com> (raw)
In-Reply-To: <20160629105736.15017-1-dsafonov@virtuozzo.com>

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>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Pavel Emelyanov <xemul@virtuozzo.com>
Cc: x86@kernel.org
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.9.0

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Safonov <dsafonov@virtuozzo.com>
To: <linux-kernel@vger.kernel.org>
Cc: <0x7f454c46@gmail.com>, <linux-mm@kvack.org>, <mingo@redhat.com>,
	<luto@amacapital.net>, <gorcunov@openvz.org>,
	<xemul@virtuozzo.com>, <oleg@redhat.com>,
	Dmitry Safonov <dsafonov@virtuozzo.com>,
	Andy Lutomirski <luto@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>, <x86@kernel.org>
Subject: [PATCHv2 1/6] x86/vdso: unmap vdso blob on vvar mapping failure
Date: Wed, 29 Jun 2016 13:57:31 +0300	[thread overview]
Message-ID: <20160629105736.15017-2-dsafonov@virtuozzo.com> (raw)
In-Reply-To: <20160629105736.15017-1-dsafonov@virtuozzo.com>

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>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Pavel Emelyanov <xemul@virtuozzo.com>
Cc: x86@kernel.org
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.9.0

  reply	other threads:[~2016-06-29 10:59 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 10:57 [PATCHv2 0/6] x86: 32-bit compatible C/R on x86_64 Dmitry Safonov
2016-06-29 10:57 ` Dmitry Safonov
2016-06-29 10:57 ` Dmitry Safonov [this message]
2016-06-29 10:57   ` [PATCHv2 1/6] x86/vdso: unmap vdso blob on vvar mapping failure Dmitry Safonov
2016-07-06 14:16   ` Andy Lutomirski
2016-07-06 14:16     ` Andy Lutomirski
2016-06-29 10:57 ` [PATCHv2 2/6] x86/vdso: introduce do_map_vdso() and vdso_type enum Dmitry Safonov
2016-06-29 10:57   ` Dmitry Safonov
2016-07-06 14:21   ` Andy Lutomirski
2016-07-06 14:21     ` Andy Lutomirski
2016-07-07 11:04     ` Dmitry Safonov
2016-07-07 11:04       ` Dmitry Safonov
2016-06-29 10:57 ` [PATCHv2 3/6] x86/arch_prctl/vdso: add ARCH_MAP_VDSO_* Dmitry Safonov
2016-06-29 10:57   ` Dmitry Safonov
2016-07-06 14:30   ` Andy Lutomirski
2016-07-06 14:30     ` Andy Lutomirski
2016-07-07 11:11     ` Dmitry Safonov
2016-07-07 11:11       ` Dmitry Safonov
2016-07-10 12:44       ` Andy Lutomirski
2016-07-10 12:44         ` Andy Lutomirski
2016-07-11 18:26         ` Oleg Nesterov
2016-07-11 18:26           ` Oleg Nesterov
2016-07-11 18:28           ` Andy Lutomirski
2016-07-11 18:28             ` Andy Lutomirski
2016-07-12 14:14             ` Oleg Nesterov
2016-07-12 14:14               ` Oleg Nesterov
2016-08-02 10:59               ` Dmitry Safonov
2016-08-02 10:59                 ` Dmitry Safonov
2016-08-10  8:35                 ` Andy Lutomirski
2016-08-10  8:35                   ` Andy Lutomirski
2016-08-10 10:49                   ` Dmitry Safonov
2016-08-10 10:49                     ` Dmitry Safonov
2016-06-29 10:57 ` [PATCHv2 4/6] x86/coredump: use pr_reg size, rather that TIF_IA32 flag Dmitry Safonov
2016-06-29 10:57   ` Dmitry Safonov
2016-06-29 10:57   ` Dmitry Safonov
2016-06-29 10:57 ` [PATCHv2 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Dmitry Safonov
2016-06-29 10:57   ` Dmitry Safonov
2016-07-06 14:32   ` Andy Lutomirski
2016-07-06 14:32     ` Andy Lutomirski
2016-06-29 10:57 ` [PATCHv2 6/6] x86/signal: add SA_{X32,IA32}_ABI sa_flags Dmitry Safonov
2016-06-29 10:57   ` Dmitry Safonov
2016-07-06 14:36   ` Andy Lutomirski
2016-07-06 14:36     ` Andy Lutomirski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160629105736.15017-2-dsafonov@virtuozzo.com \
    --to=dsafonov@virtuozzo.com \
    --cc=0x7f454c46@gmail.com \
    --cc=gorcunov@openvz.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=luto@amacapital.net \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=oleg@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    --cc=xemul@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.