summaryrefslogtreecommitdiff
path: root/sysutils/xenkernel41/patches/patch-CVE-2013-6885_1
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xenkernel41/patches/patch-CVE-2013-6885_1')
-rw-r--r--sysutils/xenkernel41/patches/patch-CVE-2013-6885_117
1 files changed, 9 insertions, 8 deletions
diff --git a/sysutils/xenkernel41/patches/patch-CVE-2013-6885_1 b/sysutils/xenkernel41/patches/patch-CVE-2013-6885_1
index 66c7f88fd68..9befecfc20f 100644
--- a/sysutils/xenkernel41/patches/patch-CVE-2013-6885_1
+++ b/sysutils/xenkernel41/patches/patch-CVE-2013-6885_1
@@ -1,12 +1,13 @@
-$NetBSD: patch-CVE-2013-6885_1,v 1.1 2013/12/04 10:35:01 drochner Exp $
+$NetBSD: patch-CVE-2013-6885_1,v 1.2 2014/02/20 17:37:25 drochner Exp $
http://lists.xenproject.org/archives/html/xen-devel/2013-12/msg00235.html
+http://lists.xenproject.org/archives/html/xen-devel/2014-02/msg01800.html
--- xen/arch/x86/cpu/amd.c.orig 2013-09-10 06:42:18.000000000 +0000
-+++ xen/arch/x86/cpu/amd.c 2013-12-03 16:43:52.000000000 +0000
-@@ -649,6 +649,20 @@ static void __devinit init_amd(struct cp
- "*** Pass \"allow_unsafe\" if you're trusting"
- " all your (PV) guest kernels. ***\n");
++++ xen/arch/x86/cpu/amd.c
+@@ -661,6 +661,20 @@ static void __devinit init_amd(struct cp
+ }
+ #endif
+ if (c->x86 == 0x16 && c->x86_model <= 0xf) {
+ rdmsrl(MSR_AMD64_LS_CFG, value);
@@ -22,6 +23,6 @@ http://lists.xenproject.org/archives/html/xen-devel/2013-12/msg00235.html
+ }
+ }
+
- /* AMD CPUs do not support SYSENTER outside of legacy mode. */
- clear_bit(X86_FEATURE_SEP, c->x86_capability);
-
+ if (c->x86 == 0x10) {
+ /*
+ * On family 10h BIOS may not have properly enabled WC+