Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Ma <lma@suse.com>2019-01-07 15:56:46 +0800
committerLin Ma <lma@suse.com>2019-01-07 16:48:30 +0800
commitfe899c3a67b66597c15768b31489ef83b774ede9 (patch)
tree23c5b360eafee5ade61b30758af09a9600661b7c
parent1ff345db7f5e8e893562343c79bd971606c00f67 (diff)
KVM: x86: Fix the duplicated failure path handling in vmx_init
(bsc#1104367).
-rw-r--r--patches.fixes/Fix-the-duplicated-failure-path-handling-in-vmx_init.patch36
-rw-r--r--series.conf4
2 files changed, 40 insertions, 0 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 5f25b35fbd..1167644729 100644
--- a/series.conf
+++ b/series.conf
@@ -25586,6 +25586,7 @@
patches.fixes/block-allow-gendisk-s-request_queue-registration-to-.patch
patches.fixes/dm-fix-incomplete-request_queue-initialization.patch
patches.fixes/dm-only-initialize-the-request_queue-once.patch
+
########################################################
# You'd better have a good reason for adding a patch
# below here.
@@ -25858,6 +25859,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
########################################################