[kernel] r15273 - dists/etch-security/linux-2.6.24/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Thu Feb 25 04:53:36 2010
New Revision: 15273

Log:
fix deadlock caused by misapplied hunk

Modified:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/mm_for_maps-shift-down_read-to-caller.patch

Modified: dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/mm_for_maps-shift-down_read-to-caller.patch
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/mm_for_maps-shift-down_read-to-caller.patch	Thu Feb 25 04:11:39 2010	(r15272)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/mm_for_maps-shift-down_read-to-caller.patch	Thu Feb 25 04:53:36 2010	(r15273)
@@ -1,3 +1,12 @@
+[Backported to Debian's 2.6.24]
+commit 60634e4b830850bb38016f1e6a7a7358eba8118c
+Author: Oleg Nesterov <oleg at redhat.com>
+Date:   Fri Jul 10 03:27:38 2009 +0200
+
+    mm_for_maps: shift down_read(mmap_sem) to the caller
+
+    commit 00f89d218523b9bf6b522349c039d5ac80aa536d upstream.
+
 diff -urpN linux-source-2.6.24.orig/fs/proc/base.c linux-source-2.6.24/fs/proc/base.c
 --- linux-source-2.6.24.orig/fs/proc/base.c	2010-02-22 17:31:39.000000000 -0700
 +++ linux-source-2.6.24/fs/proc/base.c	2010-02-22 17:32:37.000000000 -0700
@@ -27,15 +36,15 @@
  
 diff -urpN linux-source-2.6.24.orig/fs/proc/task_mmu.c linux-source-2.6.24/fs/proc/task_mmu.c
 --- linux-source-2.6.24.orig/fs/proc/task_mmu.c	2008-01-24 15:58:37.000000000 -0700
-+++ linux-source-2.6.24/fs/proc/task_mmu.c	2010-02-22 17:32:37.000000000 -0700
-@@ -392,6 +392,7 @@ static void *m_start(struct seq_file *m,
- 
- 	if (last_addr == -1UL)
++++ linux-source-2.6.24/fs/proc/task_mmu.c	2010-02-24 18:48:45.000000000 -0700
+@@ -400,6 +400,7 @@ static void *m_start(struct seq_file *m,
+ 	mm = mm_for_maps(priv->task);
+ 	if (!mm)
  		return NULL;
 +	down_read(&mm->mmap_sem);
  
- 	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);
- 	if (!priv->task)
+ 	priv->tail_vma = tail_vma = get_gate_vma(priv->task);
+ 
 diff -urpN linux-source-2.6.24.orig/fs/proc/task_nommu.c linux-source-2.6.24/fs/proc/task_nommu.c
 --- linux-source-2.6.24.orig/fs/proc/task_nommu.c	2008-01-24 15:58:37.000000000 -0700
 +++ linux-source-2.6.24/fs/proc/task_nommu.c	2010-02-22 17:32:37.000000000 -0700