[kernel] r18106 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Tue Sep 20 16:16:56 2011
New Revision: 18106

Log:
fix hppa FTBFS & prepare for upload

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion-regression.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/27

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Tue Sep 20 04:39:21 2011	(r18105)
+++ dists/lenny/linux-2.6/debian/changelog	Tue Sep 20 16:16:56 2011	(r18106)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.26-27) UNRELEASED; urgency=low
+linux-2.6 (2.6.26-27) oldstable; urgency=high
 
   [ Ben Hutchings ]
   * dm,md: Deal with merge_bvec_fn in component devices better
@@ -31,8 +31,9 @@
     - cciss: fix lost command issue
   * cifs: fix an oops that can occur when accessing filenames containing
     accented characters from a Windows ME server (Closes: #524438)
+  * [hppa] Fix FTBFS caused by CVE-2011-2496 fix
 
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Nov 2010 02:01:24 +0000
+ -- dann frazier <dannf at debian.org>  Mon, 19 Sep 2011 22:30:56 -0600
 
 linux-2.6 (2.6.26-26lenny4) oldstable-security; urgency=high
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion-regression.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion-regression.patch	Tue Sep 20 16:16:56 2011	(r18106)
@@ -0,0 +1,22 @@
+commit 66f6339311a6f6c314219f74867799320e83a4fd
+Author: dann frazier <dannf at debian.org>
+Date:   Mon Sep 19 21:26:32 2011 -0600
+
+    Remove unintentional call to perf_event_mmap()
+
+diff --git a/mm/mmap.c b/mm/mmap.c
+index acb42df..0b18249 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -1628,10 +1628,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+ 		error = -ENOMEM;
+ 		if (vma->vm_pgoff + (size >> PAGE_SHIFT) >= vma->vm_pgoff) {
+ 			error = acct_stack_growth(vma, size, grow);
+-			if (!error) {
++			if (!error)
+ 				vma->vm_end = address;
+-				perf_event_mmap(vma);
+-			}
+ 		}
+ 	}
+ 	anon_vma_unlock(vma);

Modified: dists/lenny/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/27	Tue Sep 20 04:39:21 2011	(r18105)
+++ dists/lenny/linux-2.6/debian/patches/series/27	Tue Sep 20 16:16:56 2011	(r18106)
@@ -22,3 +22,4 @@
 + bugfix/all/cciss-fix-lost-command-issue.patch
 + bugfix/all/cifs-check-that-last-search-entry-resume-key-is-valid.patch
 + bugfix/all/cifs-fix-saving-of-resume-key-before-CIFSFindNext.patch
++ bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion-regression.patch