Messages in this thread Patch in this message | | | Date | Mon, 6 Jul 2015 08:48:21 -0700 | From | tip-bot for Brian Gerst <> | Subject | [tip:x86/asm] x86/compat: Check for both 32-bit compat and x32 in get_gate_vma() |
| |
Commit-ID: c338867d0e4224771c68d0a7727289b86c23eccd Gitweb: http://git.kernel.org/tip/c338867d0e4224771c68d0a7727289b86c23eccd Author: Brian Gerst <brgerst@gmail.com> AuthorDate: Mon, 22 Jun 2015 07:55:16 -0400 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 6 Jul 2015 15:28:57 +0200
x86/compat: Check for both 32-bit compat and x32 in get_gate_vma()
Change this to CONFIG_COMPAT so both 32-bit compat and x32 will do the check.
Signed-off-by: Brian Gerst <brgerst@gmail.com> Acked-by: Andy Lutomirski <luto@kernel.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1434974121-32575-8-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 2dcc6ff..26a46f4 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -290,7 +290,7 @@ static struct vm_area_struct gate_vma = { struct vm_area_struct *get_gate_vma(struct mm_struct *mm) { -#ifdef CONFIG_IA32_EMULATION +#ifdef CONFIG_COMPAT if (!mm || mm->context.ia32_compat) return NULL; #endif
| |