From: Dmitry Safonov <dsafonov@virtuozzo.com>
To: <linux-kernel@vger.kernel.org>, <mingo@redhat.com>
Cc: <luto@amacapital.net>, <tglx@linutronix.de>, <hpa@zytor.com>,
<x86@kernel.org>, <0x7f454c46@gmail.com>, <oleg@redhat.com>,
<gorcunov@openvz.org>, <xemul@virtuozzo.com>,
<khorenko@virtuozzo.com>, Dmitry Safonov <dsafonov@virtuozzo.com>,
Andy Lutomirski <luto@kernel.org>
Subject: [PATCH 1/6] x86/vdso: unmap vdso blob on vvar mapping failure
Date: Wed, 1 Jun 2016 16:11:32 +0300 [thread overview]
Message-ID: <1464786697-20639-2-git-send-email-dsafonov@virtuozzo.com> (raw)
In-Reply-To: <1464786697-20639-1-git-send-email-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>
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
next prev parent reply other threads:[~2016-06-01 13:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 13:11 [PATCH 0/6] x86: 32-bit compatible C/R on x86_64 Dmitry Safonov
2016-06-01 13:11 ` Dmitry Safonov [this message]
2016-06-01 13:11 ` [PATCH 2/6] x86/vdso: introduce do_map_vdso() and vdso_type enum Dmitry Safonov
2016-06-03 9:50 ` Cyrill Gorcunov
2016-06-03 10:03 ` Dmitry Safonov
2016-06-01 13:11 ` [PATCH 3/6] x86/arch_prctl/vdso: add ARCH_MAP_VDSO_* Dmitry Safonov
2016-06-01 13:11 ` [PATCH 4/6] x86/coredump: use core regs, rather that TIF_IA32 flag Dmitry Safonov
2016-06-03 9:51 ` Cyrill Gorcunov
2016-06-03 9:56 ` Dmitry Safonov
2016-06-03 10:01 ` Cyrill Gorcunov
2016-06-06 20:45 ` Oleg Nesterov
2016-06-06 22:43 ` Oleg Nesterov
2016-06-08 13:28 ` Dmitry Safonov
2016-06-01 13:11 ` [PATCH 5/6] x86/ptrace: down with test_thread_flag(TIF_IA32) Dmitry Safonov
2016-06-03 9:57 ` Cyrill Gorcunov
2016-06-03 10:27 ` Dmitry Safonov
2016-06-03 10:41 ` Cyrill Gorcunov
2016-06-06 21:19 ` Oleg Nesterov
2016-06-07 11:38 ` Dmitry Safonov
2016-06-09 17:21 ` Andy Lutomirski
2016-06-10 20:07 ` Oleg Nesterov
2016-06-10 20:14 ` Andy Lutomirski
2016-06-13 13:50 ` Oleg Nesterov
2016-06-13 20:40 ` Andy Lutomirski
2016-06-14 14:34 ` Oleg Nesterov
2016-06-14 14:43 ` Dmitry Safonov
2016-06-01 13:11 ` [PATCH 6/6] x86/signal: add SA_{X32,IA32}_ABI sa_flags Dmitry Safonov
2016-06-04 5:08 ` Andy Lutomirski
2016-06-04 15:57 ` Dmitry Safonov
2016-06-01 13:15 ` [PATCH 0/6] x86: 32-bit compatible C/R on x86_64 Dmitry Safonov
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=1464786697-20639-2-git-send-email-dsafonov@virtuozzo.com \
--to=dsafonov@virtuozzo.com \
--cc=0x7f454c46@gmail.com \
--cc=gorcunov@openvz.org \
--cc=hpa@zytor.com \
--cc=khorenko@virtuozzo.com \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).