Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-13 11:36:27 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-13 11:36:27 +0100
commit5fdcc9222f58490e8e5a46fb1c56807e90a8cc6f (patch)
treec7a4e773c302ac8483a6201541a4b92734797880
parentc30ab27e14f383efd36bebae888576fb2bb94a7e (diff)
Fix the merge error from cve/linux-4.4 branch
Corrected the patch patches.arch/kvm-fix-kvm_ioctl_create_device-reference-counting-cve-2019-6974 that had a superfluous list_add() line by the merge error.
-rw-r--r--patches.arch/kvm-fix-kvm_ioctl_create_device-reference-counting-cve-2019-69747
1 files changed, 3 insertions, 4 deletions
diff --git a/patches.arch/kvm-fix-kvm_ioctl_create_device-reference-counting-cve-2019-6974 b/patches.arch/kvm-fix-kvm_ioctl_create_device-reference-counting-cve-2019-6974
index a9fa1ff81e..9e58838732 100644
--- a/patches.arch/kvm-fix-kvm_ioctl_create_device-reference-counting-cve-2019-6974
+++ b/patches.arch/kvm-fix-kvm_ioctl_create_device-reference-counting-cve-2019-6974
@@ -28,8 +28,8 @@ Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Joerg Roedel <jroedel@suse.de>
---
- virt/kvm/kvm_main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ virt/kvm/kvm_main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -44,12 +44,11 @@ Acked-by: Joerg Roedel <jroedel@suse.de>
mutex_lock(&kvm->lock);
list_del(&dev->vm_node);
mutex_unlock(&kvm->lock);
-@@ -2798,7 +2800,7 @@ static int kvm_ioctl_create_device(struc
+@@ -2798,7 +2800,6 @@ static int kvm_ioctl_create_device(struc
return ret;
}
- kvm_get_kvm(kvm);
-+ list_add(&dev->vm_node, &kvm->devices);
cd->fd = ret;
return 0;
}