From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Dmitry Safonov <dima@arista.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Borislav Petkov <bp@alien8.de>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Guo Ren <guoren@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
Ingo Molnar <mingo@redhat.com>, Oleg Nesterov <oleg@redhat.com>,
Russell King <linux@armlinux.org.uk>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Will Deacon <will@kernel.org>,
x86@kernel.org
Subject: [PATCH v2 13/19] x86/signal: Check if vdso_image_32 is mapped before trying to land on it
Date: Tue, 24 Nov 2020 00:29:26 +0000 [thread overview]
Message-ID: <20201124002932.1220517-14-dima@arista.com> (raw)
In-Reply-To: <20201124002932.1220517-1-dima@arista.com>
Provide current_has_vdso_image_32() helper and check it apriory landing
attempt on vdso vma.
The helper is a macro, not a static inline funciton to avoid
linux/sched/task_stack.h inclusion in asm/vdso.h.
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
arch/x86/entry/common.c | 7 ++++++-
arch/x86/ia32/ia32_signal.c | 4 ++--
arch/x86/include/asm/vdso.h | 4 ++++
arch/x86/kernel/signal.c | 4 ++--
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 18d8f17f755c..d9ab58cc765b 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -142,11 +142,16 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs)
/* Returns 0 to return using IRET or 1 to return using SYSEXIT/SYSRETL. */
__visible noinstr long do_fast_syscall_32(struct pt_regs *regs)
{
+ unsigned long landing_pad;
+
+ if (!current_has_vdso_image_32())
+ force_sigsegv(SIGSEGV);
+
/*
* Called using the internal vDSO SYSENTER/SYSCALL32 calling
* convention. Adjust regs so it looks like we entered using int80.
*/
- unsigned long landing_pad = (unsigned long)current->mm->context.vdso +
+ landing_pad = (unsigned long)current->mm->context.vdso +
vdso_image_32.sym_int80_landing_pad;
/*
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index ea3db15b57bf..f87ed1d53938 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -255,7 +255,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
restorer = ksig->ka.sa.sa_restorer;
} else {
/* Return stub is in 32bit vsyscall page */
- if (current->mm->context.vdso)
+ if (current_has_vdso_image_32())
restorer = current->mm->context.vdso +
vdso_image_32.sym___kernel_sigreturn;
else
@@ -336,7 +336,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
if (ksig->ka.sa.sa_flags & SA_RESTORER)
restorer = ksig->ka.sa.sa_restorer;
- else if (current->mm->context.vdso)
+ else if (current_has_vdso_image_32())
restorer = current->mm->context.vdso +
vdso_image_32.sym___kernel_rt_sigreturn;
else
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index b5d23470f56b..e3829c3a6149 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -41,6 +41,10 @@ extern const struct vdso_image vdso_image_x32;
#if defined CONFIG_X86_32 || defined CONFIG_COMPAT
extern const struct vdso_image vdso_image_32;
+
+#define current_has_vdso_image_32() \
+ likely(current->mm->context.vdso_image == &vdso_image_32 && \
+ !!current->mm->context.vdso)
#endif
extern void __init init_vdso_image(const struct vdso_image *image);
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 372ec09dc4ac..6fed2e523e0a 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -319,7 +319,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
unsafe_put_user(set->sig[1], &frame->extramask[0], Efault);
if (ksig->ka.sa.sa_flags & SA_RESTORER)
restorer = ksig->ka.sa.sa_restorer;
- else if (current->mm->context.vdso)
+ else if (current_has_vdso_image_32())
restorer = current->mm->context.vdso +
vdso_image_32.sym___kernel_sigreturn;
else
@@ -381,7 +381,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
/* Set up to return from userspace. */
if (ksig->ka.sa.sa_flags & SA_RESTORER)
restorer = ksig->ka.sa.sa_restorer;
- else if (current->mm->context.vdso)
+ else if (current_has_vdso_image_32())
restorer = current->mm->context.vdso +
vdso_image_32.sym___kernel_rt_sigreturn;
else
--
2.29.2
next prev parent reply other threads:[~2020-11-24 0:30 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 0:29 [PATCH v2 00/19] Add generic vdso_base tracking Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 01/19] x86/elf: Check in_x32_syscall() in compat_arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 02/19] elf: Move arch_setup_additional_pages() to generic elf.h Dmitry Safonov
2020-11-24 6:12 ` Christophe Leroy
2020-11-26 19:45 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 03/19] arm64: Use in_compat_task() in arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 04/19] x86: Remove compat_arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 05/19] elf: " Dmitry Safonov
2020-11-24 6:13 ` Christophe Leroy
2020-11-26 19:45 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 06/19] elf/vdso: Reuse arch_setup_additional_pages() parameters Dmitry Safonov
2020-11-24 6:18 ` Christophe Leroy
2020-11-26 19:46 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 07/19] elf: Use sysinfo_ehdr in ARCH_DLINFO() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 08/19] arm/vdso: Remove vdso pointer from mm->context Dmitry Safonov
2020-11-24 6:22 ` Christophe Leroy
2020-11-26 19:48 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 09/19] s390/vdso: Remove vdso_base " Dmitry Safonov
2020-11-24 6:22 ` Christophe Leroy
2020-11-24 0:29 ` [PATCH v2 10/19] sparc/vdso: Remove vdso " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 11/19] mm/mmap: Make vm_special_mapping::mremap return void Dmitry Safonov
2020-11-24 6:25 ` Christophe Leroy
2020-11-24 0:29 ` [PATCH v2 12/19] x86/signal: Land on &frame->retcode when vdso isn't mapped Dmitry Safonov
2020-11-24 23:08 ` Andy Lutomirski
2020-11-24 0:29 ` Dmitry Safonov [this message]
2020-11-24 23:43 ` [PATCH v2 13/19] x86/signal: Check if vdso_image_32 is mapped before trying to land on it Andy Lutomirski
2020-11-26 20:00 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 14/19] mm: Add vdso_base in mm_struct Dmitry Safonov
2020-11-24 23:37 ` Andy Lutomirski
2020-11-24 0:29 ` [PATCH v2 15/19] x86/vdso: Migrate to generic vdso_base Dmitry Safonov
2020-11-24 2:51 ` kernel test robot
2020-11-24 0:29 ` [PATCH v2 16/19] arm/vdso: " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 17/19] arm64/vdso: Migrate compat signals " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 18/19] arm64/vdso: Migrate native " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 19/19] mips/vdso: Migrate " Dmitry Safonov
2020-11-24 6:53 ` [PATCH v2 00/19] Add generic vdso_base tracking Christophe Leroy
2020-11-26 20:41 ` 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=20201124002932.1220517-14-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=guoren@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=vincenzo.frascino@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/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