[kernel] r18847 - dists/squeeze-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Thu Mar 15 07:10:12 2012
New Revision: 18847

Log:
fix backport

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Device-assignment-permission-checks.patch
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Remove-ability-to-assign-a-device-without-iommu-support.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Device-assignment-permission-checks.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Device-assignment-permission-checks.patch	Thu Mar 15 06:40:28 2012	(r18846)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Device-assignment-permission-checks.patch	Thu Mar 15 07:10:12 2012	(r18847)
@@ -29,7 +29,7 @@
     [dannf: backported to Debian's 2.6.32]
 
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 45ea167..f117640 100644
+index 77288e2..311ec18 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -43,6 +43,8 @@
@@ -41,7 +41,7 @@
  
  #include <asm/processor.h>
  #include <asm/io.h>
-@@ -578,12 +580,76 @@ out:
+@@ -575,12 +577,73 @@ out:
  	return r;
  }
  
@@ -112,13 +112,10 @@
  	struct kvm_assigned_dev_kernel *match;
  	struct pci_dev *dev;
 +	u8 header_type;
-+
-+	if (!(assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU))
-+		return -EINVAL;
  
- 	down_read(&kvm->slots_lock);
- 	mutex_lock(&kvm->lock);
-@@ -610,6 +676,18 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
+ 	if (!(assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU))
+ 		return -EINVAL;
+@@ -610,6 +673,18 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
  		r = -EINVAL;
  		goto out_free;
  	}

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Remove-ability-to-assign-a-device-without-iommu-support.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Remove-ability-to-assign-a-device-without-iommu-support.patch	Thu Mar 15 06:40:28 2012	(r18846)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/KVM-Remove-ability-to-assign-a-device-without-iommu-support.patch	Thu Mar 15 07:10:12 2012	(r18847)
@@ -12,20 +12,18 @@
     Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
     [dannf: backported to Debian's 2.6.32]
 
-diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 4f3434f..45ea167 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -523,6 +523,9 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,
- 	if (!irqchip_in_kernel(kvm))
- 		return r;
+@@ -582,6 +582,9 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
+ 	struct kvm_assigned_dev_kernel *match;
+ 	struct pci_dev *dev;
  
 +	if (!(assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU))
 +		return -EINVAL;
 +
+ 	down_read(&kvm->slots_lock);
  	mutex_lock(&kvm->lock);
- 	r = -ENODEV;
- 	match = kvm_find_assigned_dev(&kvm->arch.assigned_dev_head,
+ 
 @@ -635,16 +638,14 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
  
  	list_add(&match->list, &kvm->arch.assigned_dev_head);