[kernel] r15219 - in dists/trunk/linux-2.6/debian/patches: bugfix/x86 series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 03:43:19 2010
New Revision: 15219

Log:
Fix up x86 KVM security patches for 2.6.33-rc8

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/x86/kvm-pit-control-word-is-write-only.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch	Fri Feb 19 03:37:13 2010	(r15218)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch	Fri Feb 19 03:43:19 2010	(r15219)
@@ -61,7 +61,7 @@
 index 012dd8b..06f1b69 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -3075,11 +3075,60 @@ static int pio_string_write(struct kvm_vcpu *vcpu)
+@@ -3075,10 +3075,59 @@ static int pio_string_write(struct kvm_vcpu *vcpu)
  	return r;
  }
  
@@ -104,8 +104,7 @@
 +	return true;
 +}
 +
- int kvm_emulate_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,
- 		  int size, unsigned port)
+ int kvm_emulate_pio(struct kvm_vcpu *vcpu, int in, int size, unsigned port)
  {
  	unsigned long val;
  

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:37:13 2010	(r15218)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:43:19 2010	(r15219)
@@ -48,12 +48,10 @@
 
 + bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch
 
-# FIXME:
-#+ bugfix/x86/kvm-pit-control-word-is-write-only.patch
-#+ bugfix/x86/kvm-fix-memory-access-during-x86-emulation.patch
-#+ bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch
-#+ bugfix/x86/kvm-Fix-popf-emulation.patch
-#+ bugfix/x86/kvm-Check-CPL-level-during-privilege-instruction-emulation.patch
++ bugfix/x86/kvm-fix-memory-access-during-x86-emulation.patch
++ bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch
++ bugfix/x86/kvm-Fix-popf-emulation.patch
++ bugfix/x86/kvm-Check-CPL-level-during-privilege-instruction-emulation.patch
 
 + debian/sysrq-mask.patch
 + bugfix/all/efifb_fix_v2.patch