[linux] 02/02: [x86] KVM: rename update_db_bp_intercept to update_bp_intercept

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch jessie-security
in repository linux.

commit 2be3623fdeb8036ecb5b092c618dd1ee8b95869b
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sun Nov 15 10:09:10 2015 +0100

    [x86] KVM: rename update_db_bp_intercept to update_bp_intercept
---
 debian/changelog                                   |  1 +
 ...ame-update_db_bp_intercept-to-update_bp_i.patch | 61 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 63 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9637f9f..9a91ac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux (3.16.7-ckt11-1+deb8u7) UNRELEASED; urgency=medium
 
   * [x86] KVM: svm: unconditionally intercept #DB (CVE-2015-8104)
+  * [x86] KVM: rename update_db_bp_intercept to update_bp_intercept
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sun, 15 Nov 2015 10:01:10 +0100
 
diff --git a/debian/patches/bugfix/x86/kvm-x86-rename-update_db_bp_intercept-to-update_bp_i.patch b/debian/patches/bugfix/x86/kvm-x86-rename-update_db_bp_intercept-to-update_bp_i.patch
new file mode 100644
index 0000000..ac5b39c
--- /dev/null
+++ b/debian/patches/bugfix/x86/kvm-x86-rename-update_db_bp_intercept-to-update_bp_i.patch
@@ -0,0 +1,61 @@
+From: Paolo Bonzini <pbonzini at redhat.com>
+Date: Tue, 10 Nov 2015 11:55:36 +0100
+Subject: KVM: x86: rename update_db_bp_intercept to update_bp_intercept
+Origin: https://git.kernel.org/linus/a96036b8ef7df9f10cd575c0d78359bd33188e8e
+
+Because #DB is now intercepted unconditionally, this callback
+only operates on #BP for both VMX and SVM.
+
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+[carnil: Backported to 3.16: adjust context]
+---
+ arch/x86/include/asm/kvm_host.h | 2 +-
+ arch/x86/kvm/svm.c              | 2 +-
+ arch/x86/kvm/vmx.c              | 2 +-
+ arch/x86/kvm/x86.c              | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/arch/x86/include/asm/kvm_host.h
++++ b/arch/x86/include/asm/kvm_host.h
+@@ -681,7 +681,7 @@ struct kvm_x86_ops {
+ 	void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);
+ 	void (*vcpu_put)(struct kvm_vcpu *vcpu);
+ 
+-	void (*update_db_bp_intercept)(struct kvm_vcpu *vcpu);
++	void (*update_bp_intercept)(struct kvm_vcpu *vcpu);
+ 	int (*get_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
+ 	int (*set_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr);
+ 	u64 (*get_segment_base)(struct kvm_vcpu *vcpu, int seg);
+--- a/arch/x86/kvm/svm.c
++++ b/arch/x86/kvm/svm.c
+@@ -4316,7 +4316,7 @@ static struct kvm_x86_ops svm_x86_ops =
+ 	.vcpu_load = svm_vcpu_load,
+ 	.vcpu_put = svm_vcpu_put,
+ 
+-	.update_db_bp_intercept = update_bp_intercept,
++	.update_bp_intercept = update_bp_intercept,
+ 	.get_msr = svm_get_msr,
+ 	.set_msr = svm_set_msr,
+ 	.get_segment_base = svm_get_segment_base,
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -8827,7 +8827,7 @@ static struct kvm_x86_ops vmx_x86_ops =
+ 	.vcpu_load = vmx_vcpu_load,
+ 	.vcpu_put = vmx_vcpu_put,
+ 
+-	.update_db_bp_intercept = update_exception_bitmap,
++	.update_bp_intercept = update_exception_bitmap,
+ 	.get_msr = vmx_get_msr,
+ 	.set_msr = vmx_set_msr,
+ 	.get_segment_base = vmx_get_segment_base,
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -6681,7 +6681,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+ 	 */
+ 	kvm_set_rflags(vcpu, rflags);
+ 
+-	kvm_x86_ops->update_db_bp_intercept(vcpu);
++	kvm_x86_ops->update_bp_intercept(vcpu);
+ 
+ 	r = 0;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 86b08a5..b4ac20f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -660,3 +660,4 @@ bugfix/all/rds-fix-race-condition-when-sending-a-message-on-unbound-socket.patch
 bugfix/x86/kvm-x86-vmx-avoid-guest-host-dos-by-intercepting-ac.patch
 bugfix/x86/kvm-x86-svm-intercept-ac-to-avoid-guest-host-exploit.patch
 bugfix/x86/kvm-svm-unconditionally-intercept-DB.patch
+bugfix/x86/kvm-x86-rename-update_db_bp_intercept-to-update_bp_i.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git