From 22dea6c44b3028289a0b67a0dd108bbf94361caa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Jan 2015 09:40:04 -0800 Subject: [PATCH] delete kvm patch from 3.10 and 3.14 trees --- ...sly-incomplete-fix-for-cve-2014-8480.patch | 33 ------------------- queue-3.10/series | 1 - ...sly-incomplete-fix-for-cve-2014-8480.patch | 33 ------------------- queue-3.14/series | 1 - 4 files changed, 68 deletions(-) delete mode 100644 queue-3.10/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch delete mode 100644 queue-3.14/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch diff --git a/queue-3.10/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch b/queue-3.10/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch deleted file mode 100644 index 75c7223a038..00000000000 --- a/queue-3.10/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 Mon Sep 17 00:00:00 2001 -From: Nadav Amit -Date: Thu, 8 Jan 2015 11:59:03 +0100 -Subject: KVM: x86: Fix of previously incomplete fix for CVE-2014-8480 - -From: Nadav Amit - -commit 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 upstream. - -STR and SLDT with rip-relative operand can cause a host kernel oops. -Mark them as DstMem as well. - -Signed-off-by: Nadav Amit -Signed-off-by: Paolo Bonzini -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kvm/emulate.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/x86/kvm/emulate.c -+++ b/arch/x86/kvm/emulate.c -@@ -3808,8 +3808,8 @@ static const struct opcode group5[] = { - }; - - static const struct opcode group6[] = { -- DI(Prot, sldt), -- DI(Prot, str), -+ DI(Prot | DstMem, sldt), -+ DI(Prot | DstMem, str), - II(Prot | Priv | SrcMem16, em_lldt, lldt), - II(Prot | Priv | SrcMem16, em_ltr, ltr), - N, N, N, N, diff --git a/queue-3.10/series b/queue-3.10/series index 4a204aa3afe..f2ef68590cf 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -15,7 +15,6 @@ can-dev-fix-crtlmode_supported-check.patch clocksource-exynos_mct-fix-bitmask-regression-for-exynos4_mct_write.patch x86-hyperv-mark-the-hyper-v-clocksource-as-being-continuous.patch x86-tsc-change-fast-tsc-calibration-failed-from-error-to-info.patch -kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch x86-tls-ldt-stop-checking-lm-in-ldt_empty.patch x86-tls-interpret-an-all-zero-struct-user_desc-as-no-segment.patch x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch diff --git a/queue-3.14/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch b/queue-3.14/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch deleted file mode 100644 index 7659859f15e..00000000000 --- a/queue-3.14/kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 Mon Sep 17 00:00:00 2001 -From: Nadav Amit -Date: Thu, 8 Jan 2015 11:59:03 +0100 -Subject: KVM: x86: Fix of previously incomplete fix for CVE-2014-8480 - -From: Nadav Amit - -commit 63ea0a49ae0b145b91ff2b070c01b66fc75854b9 upstream. - -STR and SLDT with rip-relative operand can cause a host kernel oops. -Mark them as DstMem as well. - -Signed-off-by: Nadav Amit -Signed-off-by: Paolo Bonzini -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kvm/emulate.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/x86/kvm/emulate.c -+++ b/arch/x86/kvm/emulate.c -@@ -3668,8 +3668,8 @@ static const struct opcode group5[] = { - }; - - static const struct opcode group6[] = { -- DI(Prot, sldt), -- DI(Prot, str), -+ DI(Prot | DstMem, sldt), -+ DI(Prot | DstMem, str), - II(Prot | Priv | SrcMem16, em_lldt, lldt), - II(Prot | Priv | SrcMem16, em_ltr, ltr), - N, N, N, N, diff --git a/queue-3.14/series b/queue-3.14/series index cb2c2d3145b..28e71c23270 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -23,7 +23,6 @@ clocksource-exynos_mct-fix-bitmask-regression-for-exynos4_mct_write.patch x86-hyperv-mark-the-hyper-v-clocksource-as-being-continuous.patch x86-tsc-change-fast-tsc-calibration-failed-from-error-to-info.patch x86-boot-skip-relocs-when-load-address-unchanged.patch -kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch x86-tls-ldt-stop-checking-lm-in-ldt_empty.patch x86-tls-interpret-an-all-zero-struct-user_desc-as-no-segment.patch x86-apic-re-enable-pci_msi-support-for-non-smp-x86_32.patch -- 2.47.3