| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20150716081332.9413DD5B@viggo.jf.intel.com>
Date: Thu, 16 Jul 2015 01:13:32 -0700
From: Dave Hansen <dave@...1.net>
To: dave@...1.net
Cc: torvalds@...ux-foundation.org, mingo@...nel.org,
linux-kernel@...r.kernel.org, luto@...capital.net, bp@...en8.de,
fenghua.yu@...el.com, hpa@...or.com, oleg@...hat.com,
tglx@...utronix.de, ross.zwisler@...ux.intel.com
Subject: [RFC][PATCH 1/2] x86, fpu: disable XSAVE if init buf too small
This is _very_ lightly tested. Just RFC for now. The fallback
code is not tested at all because I'm hitting another bug.
--
The recent x86 FPU rework changed a dynamic allocation to a
static one. But, the static one is undersized and we overrun it,
corrupting memory in some cases.
This patch detects the situation and disables the XSAVE feature.
I have not been able to test this in practice because I'm hitting
another bug. tsk->signal gets corrupted if I disable XSAVE.
tsk->signal is conveniently located a few hundred bytes after the
'struct fpu' which is now embedded in task_struct, so I suspect
this is another overrun. Anyone should be able to reproduce this
by under-sizing XSTATE_MAX_SIZE in the next patch.
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Fenghua Yu <fenghua.yu@...el.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: leg Nesterov <oleg@...hat.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ross Zwisler <ross.zwisler@...ux.intel.com>
---
b/arch/x86/include/asm/fpu/internal.h | 1
b/arch/x86/kernel/fpu/init.c | 17 ++++++++------
b/arch/x86/kernel/fpu/xstate.c | 41 +++++++++++++++++++++++-----------
3 files changed, 39 insertions(+), 20 deletions(-)
diff -puN arch/x86/include/asm/fpu/internal.h~disable-xsave-if-init-buf-too-small arch/x86/include/asm/fpu/internal.h
--- a/arch/x86/include/asm/fpu/internal.h~disable-xsave-if-init-buf-too-small 2015-07-16 01:11:02.889010467 -0700
+++ b/arch/x86/include/asm/fpu/internal.h 2015-07-16 01:11:33.928398118 -0700
@@ -42,6 +42,7 @@ extern void fpu__init_cpu_xstate(void);
extern void fpu__init_system(struct cpuinfo_x86 *c);
extern void fpu__init_check_bugs(void);
extern void fpu__resume_cpu(void);
+extern void fpu__clear_all_xsave_cpu_caps(void);
/*
* Debugging facility:
diff -puN arch/x86/kernel/fpu/init.c~disable-xsave-if-init-buf-too-small arch/x86/kernel/fpu/init.c
--- a/arch/x86/kernel/fpu/init.c~disable-xsave-if-init-buf-too-small 2015-07-16 01:11:02.890010512 -0700
+++ b/arch/x86/kernel/fpu/init.c 2015-07-16 01:11:02.896010780 -0700
@@ -301,20 +301,23 @@ static int __init no_387(char *s)
}
__setup("no387", no_387);
-/*
- * Disable all xstate CPU features:
- */
-static int __init x86_noxsave_setup(char *s)
+void fpu__clear_all_xsave_cpu_caps(void)
{
- if (strlen(s))
- return 0;
-
setup_clear_cpu_cap(X86_FEATURE_XSAVE);
setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);
setup_clear_cpu_cap(X86_FEATURE_XSAVES);
setup_clear_cpu_cap(X86_FEATURE_AVX);
setup_clear_cpu_cap(X86_FEATURE_AVX2);
+}
+/*
+ * Disable all xstate CPU features:
+ */
+static int __init x86_noxsave_setup(char *s)
+{
+ if (strlen(s))
+ return 0;
+ fpu__clear_all_xsave_cpu_caps();
return 1;
}
__setup("noxsave", x86_noxsave_setup);
diff -puN arch/x86/kernel/fpu/xstate.c~disable-xsave-if-init-buf-too-small arch/x86/kernel/fpu/xstate.c
--- a/arch/x86/kernel/fpu/xstate.c~disable-xsave-if-init-buf-too-small 2015-07-16 01:11:02.892010601 -0700
+++ b/arch/x86/kernel/fpu/xstate.c 2015-07-16 01:11:02.895010735 -0700
@@ -291,26 +291,37 @@ static void __init setup_init_fpu_buf(vo
}
/*
- * Calculate total size of enabled xstates in XCR0/xfeatures_mask.
+ * Ask the CPU for the total size of the buffer needed to save all the
+ * enabled xstates in XCR0/xfeatures_mask.
*/
-static void __init init_xstate_size(void)
+static int __init fetch_xstate_size(void)
{
unsigned int eax, ebx, ecx, edx;
- int i;
if (!cpu_has_xsaves) {
+ /* Standard format */
cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);
- xstate_size = ebx;
- return;
+ } else {
+ /* Compacted format */
+ cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx);
}
- xstate_size = FXSAVE_SIZE + XSAVE_HDR_SIZE;
- for (i = 2; i < 64; i++) {
- if (test_bit(i, (unsigned long *)&xfeatures_mask)) {
- cpuid_count(XSTATE_CPUID, i, &eax, &ebx, &ecx, &edx);
- xstate_size += eax;
- }
- }
+ return ebx;
+}
+
+/*
+ * We did not allocate enough size in our init_fpstate to hold
+ * the xsave buffer on this system. Back out the xsave enabling
+ * we did so far and disable xsaves.
+ */
+static void xstate_size_overflow_error(void)
+{
+ pr_warn("x86/fpu: xstates too large (%d), disabling XSAVE\n", xstate_size);
+ /* Disable the xsave feature itself */
+ cr4_clear_bits(X86_CR4_OSXSAVE);
+
+ /* Clear the software copy of all the xsave-related cpuid bits */
+ fpu__clear_all_xsave_cpu_caps();
}
/*
@@ -350,7 +361,11 @@ void __init fpu__init_system_xstate(void
fpu__init_cpu_xstate();
/* Recompute the context size for enabled features: */
- init_xstate_size();
+ xstate_size = fetch_xstate_size();
+ if (xstate_size > sizeof(init_fpstate.xsave)) {
+ xstate_size_overflow_error();
+ return;
+ }
update_regset_xstate_info(xstate_size, xfeatures_mask);
fpu__init_prepare_fx_sw_frame();
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists