[kernel] r20067 - in dists/squeeze-security/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Dann Frazier]

Author: dannf
Date: Thu May  9 05:45:48 2013
New Revision: 20067

Log:
Revert bugfix/x86/KVM-lock-slots_lock-around-device-assignment.patch

Our caller already holds the slots_lock, trying to grab it again will cause a
hang.

Deleted:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/KVM-lock-slots_lock-around-device-assignment.patch
Modified:
   dists/squeeze-security/linux-2.6/debian/changelog
   dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze2

Modified: dists/squeeze-security/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/changelog	Thu May  9 03:30:24 2013	(r20066)
+++ dists/squeeze-security/linux-2.6/debian/changelog	Thu May  9 05:45:48 2013	(r20067)
@@ -20,9 +20,7 @@
   [ Ben Hutchings ]
   * ptrace: Fix ptrace when task is in task_is_stopped() state
     (regression in 2.6.32-48squeeze1) (Closes: #704437)
-  * [x86] KVM: Fix device assignment page leak (CVE-2012-2121)
-    - unmap pages from the iommu when slots are removed
-    - lock slots_lock around device assignment
+  * [x86] KVM: unmap pages from the iommu when slots are removed (CVE-2012-2121)
   * inet: add RCU protection to inet->opt (CVE-2012-3552)
   * [x86] KVM: invalid opcode oops on SET_SREGS with OSXSAVE bit set
     (CVE-2012-4461)

Modified: dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze2
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze2	Thu May  9 03:30:24 2013	(r20066)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/48squeeze2	Thu May  9 05:45:48 2013	(r20067)
@@ -2,7 +2,6 @@
 + bugfix/all/keys-fix-race-with-concurrent-install_user_keyrings.patch
 + bugfix/all/fix-ptrace-when-task-is-in-task_is_stopped-state.patch
 + bugfix/x86/KVM-unmap-pages-from-the-iommu-when-slots-are-remove.patch
-+ bugfix/x86/KVM-lock-slots_lock-around-device-assignment.patch
 + bugfix/all/inet-add-RCU-protection-to-inet-opt.patch
 + bugfix/x86/KVM-x86-invalid-opcode-oops-on-SET_SREGS-with-OSXSAV.patch
 + bugfix/all/xfrm_user-fix-info-leak-in-copy_to_user_state.patch