[kernel] r16589 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Wed Nov 24 15:13:06 2010
New Revision: 16589

Log:
[x86] KVM: SVM: Fix wrong intercept masks for KVM_{GET,SET}_VCPU_EVENTS on 32 bit

thanks to Philipp Matthias Hahn (Closes: #599507)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/KVM-SVM-Fix-wrong-intercept-masks-on-32-bit-extra.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/28

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Nov 22 22:57:38 2010	(r16588)
+++ dists/sid/linux-2.6/debian/changelog	Wed Nov 24 15:13:06 2010	(r16589)
@@ -57,6 +57,8 @@
     - [x86] KVM: VMX: Fix host GDT.LIMIT corruption
     - [x86] KVM: Fix fs/gs reload oops with invalid ldt (CVE-2010-3698)
     - gdth: Fix integer overflow in ioctl (CVE-2010-4157)
+  * [x86] KVM: SVM: Fix wrong intercept masks for KVM_{GET,SET}_VCPU_EVENTS
+    on 32 bit, thanks to Philipp Matthias Hahn (Closes: #599507)
 
   [ dann frazier ]
   * [vserver] Update patch to 2.6.32.25-vs2.3.0.36.29.6

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/KVM-SVM-Fix-wrong-intercept-masks-on-32-bit-extra.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/KVM-SVM-Fix-wrong-intercept-masks-on-32-bit-extra.patch	Wed Nov 24 15:13:06 2010	(r16589)
@@ -0,0 +1,23 @@
+From: Philipp Matthias Hahn <pmhahn at debian.org>
+Subject: Bug#599507: SVM: Fix wrong intercept masks on 32 bit
+
+The bug is not fixed, since
+features/all/KVM-x86-Add-KVM_GET-SET_VCPU_EVENTS.patch from
+debian/pacthes/series/12 introduces the new function svm_set_nmi_mask(),
+which also has the wrong "1UL" instead of the correct "1ULL".
+
+--- a/arch/x86/kvm/svm.c        2010-11-24 14:29:05.000000000 +0100
++++ b/arch/x86/kvm/svm.c        2010-11-24 13:24:35.000000000 +0100
+@@ -2566,10 +2479,10 @@ static void svm_set_nmi_mask(struct kvm_
+ 
+ 	if (masked) {
+ 		svm->vcpu.arch.hflags |= HF_NMI_MASK;
+-		svm->vmcb->control.intercept |= (1UL << INTERCEPT_IRET);
++		svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);
+ 	} else {
+ 		svm->vcpu.arch.hflags &= ~HF_NMI_MASK;
+-		svm->vmcb->control.intercept &= ~(1UL << INTERCEPT_IRET);
++		svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);
+ 	}
+ }
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/28
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/28	Mon Nov 22 22:57:38 2010	(r16588)
+++ dists/sid/linux-2.6/debian/patches/series/28	Wed Nov 24 15:13:06 2010	(r16589)
@@ -49,3 +49,4 @@
 + bugfix/all/atl1c-Fix-hardware-type-check-for-enabling-OTP-CLK.patch
 - bugfix/x86/KVM-SVM-Fix-wrong-intercept-masks-on-32-bit.patch
 + bugfix/all/stable/2.6.32.26.patch
++ bugfix/x86/KVM-SVM-Fix-wrong-intercept-masks-on-32-bit-extra.patch