Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2019-01-14 13:17:06 +0100
committerMichal Hocko <mhocko@suse.com>2019-01-14 13:17:06 +0100
commit210ed0b82e547c79903ee0c3ab59df9b88239ed4 (patch)
tree0f8f11b0e228c8d74cc2744941640d8c7b9030cb
parent028c78358ecc40a60fc59e0ea3973c16ae6366fe (diff)
parentfe899c3a67b66597c15768b31489ef83b774ede9 (diff)
Merge remote-tracking branch 'origin/users/lma/SLE11-SP4/for-next' into users/mhocko/SLE11-SP4/for-next
-rw-r--r--patches.fixes/Fix-the-duplicated-failure-path-handling-in-vmx_init.patch36
-rw-r--r--series.conf4
2 files changed, 39 insertions, 1 deletions
diff --git a/patches.fixes/Fix-the-duplicated-failure-path-handling-in-vmx_init.patch b/patches.fixes/Fix-the-duplicated-failure-path-handling-in-vmx_init.patch
new file mode 100644
index 0000000000..02759a1de1
--- /dev/null
+++ b/patches.fixes/Fix-the-duplicated-failure-path-handling-in-vmx_init.patch
@@ -0,0 +1,36 @@
+From: Lin Ma <lma@suse.com>
+Date: Mon, 7 Jan 2019 15:52:32 +0800
+Subject: KVM: x86: Fix the duplicated failure path handling in vmx_init
+Patch-mainline: Never, suse fix only
+References: bsc#1104367
+
+Signed-off-by: Lin Ma <lma@suse.com>
+---
+ arch/x86/kvm/vmx.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
+index 435746f8ad5d..67c55d1441a0 100644
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -8325,7 +8325,7 @@ static int __init vmx_init(void)
+ r = vmx_setup_l1d_flush(vmentry_l1d_flush_param);
+ if (r) {
+ vmx_exit();
+- goto out8;
++ goto out7;
+ }
+ }
+
+@@ -8375,8 +8375,6 @@ static int __init vmx_init(void)
+
+ return 0;
+
+-out8:
+- vmx_cleanup_l1d_flush();
+ out7:
+ free_page((unsigned long)vmx_vmwrite_bitmap);
+ out6:
+--
+2.16.2
+
diff --git a/series.conf b/series.conf
index 7851307ae4..a74a03355b 100644
--- a/series.conf
+++ b/series.conf
@@ -25589,7 +25589,6 @@
# bsc#1116841, CVE-2018-19407
patches.arch/kvm-x86-fix-scan-ioapic-use-before-initialization
-
########################################################
# You'd better have a good reason for adding a patch
# below here.
@@ -25862,6 +25861,9 @@
patches.fixes/0001-x86-paravirt-Fix-some-warning-messages.patch
+ # bsc#1104367
+ patches.fixes/Fix-the-duplicated-failure-path-handling-in-vmx_init.patch
+
########################################################
# xen architecture, version 3
########################################################