94 lines
3.4 KiB
Diff
94 lines
3.4 KiB
Diff
From 34b5c16ae093e5663c398c87569793bfbec1c7ca Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
|
|
Date: Fri, 27 Oct 2017 13:25:30 -0700
|
|
Subject: [PATCH 085/231] ptrace,x86: Make user_64bit_mode() available to
|
|
32-bit builds
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2017-5754
|
|
|
|
In its current form, user_64bit_mode() can only be used when CONFIG_X86_64
|
|
is selected. This implies that code built with CONFIG_X86_64=n cannot use
|
|
it. If a piece of code needs to be built for both CONFIG_X86_64=y and
|
|
CONFIG_X86_64=n and wants to use this function, it needs to wrap it in
|
|
an #ifdef/#endif; potentially, in multiple places.
|
|
|
|
This can be easily avoided with a single #ifdef/#endif pair within
|
|
user_64bit_mode() itself.
|
|
|
|
Suggested-by: Borislav Petkov <bp@suse.de>
|
|
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Reviewed-by: Borislav Petkov <bp@suse.de>
|
|
Cc: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Dave Hansen <dave.hansen@linux.intel.com>
|
|
Cc: ricardo.neri@intel.com
|
|
Cc: Adrian Hunter <adrian.hunter@intel.com>
|
|
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Cc: Huang Rui <ray.huang@amd.com>
|
|
Cc: Qiaowei Ren <qiaowei.ren@intel.com>
|
|
Cc: Shuah Khan <shuah@kernel.org>
|
|
Cc: Kees Cook <keescook@chromium.org>
|
|
Cc: Jonathan Corbet <corbet@lwn.net>
|
|
Cc: Jiri Slaby <jslaby@suse.cz>
|
|
Cc: Dmitry Vyukov <dvyukov@google.com>
|
|
Cc: "Ravi V. Shankar" <ravi.v.shankar@intel.com>
|
|
Cc: Chris Metcalf <cmetcalf@mellanox.com>
|
|
Cc: Brian Gerst <brgerst@gmail.com>
|
|
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Cc: Andy Lutomirski <luto@kernel.org>
|
|
Cc: Colin Ian King <colin.king@canonical.com>
|
|
Cc: Chen Yucong <slaoub@gmail.com>
|
|
Cc: Adam Buchbinder <adam.buchbinder@gmail.com>
|
|
Cc: Vlastimil Babka <vbabka@suse.cz>
|
|
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
|
|
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
|
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
Cc: Andrew Morton <akpm@linux-foundation.org>
|
|
Cc: Thomas Garnier <thgarnie@google.com>
|
|
Link: https://lkml.kernel.org/r/1509135945-13762-4-git-send-email-ricardo.neri-calderon@linux.intel.com
|
|
|
|
(cherry picked from commit e27c310af5c05cf876d9cad006928076c27f54d4)
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
(cherry picked from commit 20ddf08f867d3d96788299cd2fb7676590d64250)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
arch/x86/include/asm/ptrace.h | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
|
|
index 2b5d686ea9f3..ea78a8438a8a 100644
|
|
--- a/arch/x86/include/asm/ptrace.h
|
|
+++ b/arch/x86/include/asm/ptrace.h
|
|
@@ -115,9 +115,9 @@ static inline int v8086_mode(struct pt_regs *regs)
|
|
#endif
|
|
}
|
|
|
|
-#ifdef CONFIG_X86_64
|
|
static inline bool user_64bit_mode(struct pt_regs *regs)
|
|
{
|
|
+#ifdef CONFIG_X86_64
|
|
#ifndef CONFIG_PARAVIRT
|
|
/*
|
|
* On non-paravirt systems, this is the only long mode CPL 3
|
|
@@ -128,8 +128,12 @@ static inline bool user_64bit_mode(struct pt_regs *regs)
|
|
/* Headers are too twisted for this to go in paravirt.h. */
|
|
return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
|
|
#endif
|
|
+#else /* !CONFIG_X86_64 */
|
|
+ return false;
|
|
+#endif
|
|
}
|
|
|
|
+#ifdef CONFIG_X86_64
|
|
#define current_user_stack_pointer() current_pt_regs()->sp
|
|
#define compat_user_stack_pointer() current_pt_regs()->sp
|
|
#endif
|
|
--
|
|
2.14.2
|
|
|