[kernel] r22421 - in dists/wheezy/linux/debian: . patches patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Wed Feb 25 00:14:06 2015
New Revision: 22421

Log:
[x86] mm/fault: Fix semaphore imbalance introduced in 3.2.67

Added:
   dists/wheezy/linux/debian/patches/bugfix/x86/x86-mm-fault-fix-semaphore-imbalance.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Tue Feb 24 22:24:10 2015	(r22420)
+++ dists/wheezy/linux/debian/changelog	Wed Feb 25 00:14:06 2015	(r22421)
@@ -69,6 +69,7 @@
       current VRAM size.
     - drm/radeon: add missing crtc unlock when setting up the MC
   * PCI: quirks: Fix backport of quirk_io()
+  * [x86] mm/fault: Fix semaphore imbalance introduced in 3.2.67
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Feb 2015 03:42:59 +0000
 

Added: dists/wheezy/linux/debian/patches/bugfix/x86/x86-mm-fault-fix-semaphore-imbalance.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/bugfix/x86/x86-mm-fault-fix-semaphore-imbalance.patch	Wed Feb 25 00:14:06 2015	(r22421)
@@ -0,0 +1,24 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 25 Feb 2015 00:02:28 +0000
+Subject: x86: mm/fault: Fix semaphore imbalance
+
+When backporting commit 33692f27597f ('vm: add VM_FAULT_SIGSEGV
+handling support') I didn't notice that it depended on a recent change
+to the locking context of mm_fault_error() (commit 7fb08eca4527,
+'x86: mm: move mmap_sem unlock from mm_fault_error() to caller').
+That isn't easily applicable to 3.2, so instead make sure we drop
+mm->mmap_sem on the new branch of mm_fault_error().
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/arch/x86/mm/fault.c
++++ b/arch/x86/mm/fault.c
+@@ -878,7 +878,7 @@ mm_fault_error(struct pt_regs *regs, uns
+ 			     VM_FAULT_HWPOISON_LARGE))
+ 			do_sigbus(regs, error_code, address, fault);
+ 		else if (fault & VM_FAULT_SIGSEGV)
+-			bad_area_nosemaphore(regs, error_code, address);
++			bad_area(regs, error_code, address);
+ 		else
+ 			BUG();
+ 	}

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Tue Feb 24 22:24:10 2015	(r22420)
+++ dists/wheezy/linux/debian/patches/series	Wed Feb 25 00:14:06 2015	(r22421)
@@ -1141,3 +1141,4 @@
 debian/sock-fix-abi-change-in-3.2.67.patch
 debian/rmap-fix-abi-change-in-3.2.67.patch
 bugfix/all/pci-quirks-fix-backport-of-quirk_io.patch
+bugfix/x86/x86-mm-fault-fix-semaphore-imbalance.patch