[kernel] r13345 - in dists/etch-security/linux-2.6.24/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Apr  6 06:18:28 2009
New Revision: 13345

Log:
shm: fix shmctl(SHM_INFO) lockup with !CONFIG_SHMEM (CVE-2009-0859)
This issue does not effect pre-build Debian kernels.

Added:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch
      - copied, changed from r13332, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch
Modified:
   dists/etch-security/linux-2.6.24/debian/changelog
   dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.8etch1

Modified: dists/etch-security/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/changelog	Mon Apr  6 06:01:09 2009	(r13344)
+++ dists/etch-security/linux-2.6.24/debian/changelog	Mon Apr  6 06:18:28 2009	(r13345)
@@ -22,6 +22,8 @@
     (CVE-2009-0745)
   * ext4: Add sanity check to make_indexed_dir (CVE-2009-0746)
   * [amd64] syscall-audit: fix 32/64 syscall hole (CVE-2009-0834)
+  * shm: fix shmctl(SHM_INFO) lockup with !CONFIG_SHMEM (CVE-2009-0859)
+    This issue does not effect pre-build Debian kernels.
 
  -- dann frazier <dannf at debian.org>  Tue, 24 Feb 2009 23:25:36 -0700
 

Copied and modified: dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch (from r13332, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch)
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch	Sat Apr  4 21:39:54 2009	(r13332, copy source)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch	Mon Apr  6 06:18:28 2009	(r13345)
@@ -23,12 +23,12 @@
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
-Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org
+Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at debian.org
 
-diff -urpN linux-source-2.6.26.orig/ipc/shm.c linux-source-2.6.26/ipc/shm.c
---- linux-source-2.6.26.orig/ipc/shm.c	2009-03-25 17:20:41.000000000 -0600
-+++ linux-source-2.6.26/ipc/shm.c	2009-04-04 15:13:27.000000000 -0600
-@@ -579,11 +579,15 @@ static void shm_get_stat(struct ipc_name
+diff -urpN a/ipc/shm.c b/ipc/shm.c
+--- a/ipc/shm.c	2009-04-05 19:32:23.000000000 -0600
++++ b/ipc/shm.c	2009-04-06 00:01:41.000000000 -0600
+@@ -630,11 +630,15 @@ static void shm_get_stat(struct ipc_name
  			struct address_space *mapping = inode->i_mapping;
  			*rss += (HPAGE_SIZE/PAGE_SIZE)*mapping->nrpages;
  		} else {

Modified: dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.8etch1
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.8etch1	Mon Apr  6 06:01:09 2009	(r13344)
+++ dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.8etch1	Mon Apr  6 06:18:28 2009	(r13345)
@@ -76,3 +76,4 @@
 + bugfix/all/ext4-initialize-the-new-group-descriptor-when-resizing-the-filesystem.patch
 + bugfix/all/ext4-add-sanity-check-to-make_indexed_dir.patch
 + bugfix/syscall-audit-fix-32+64-syscall-hole.patch
++ bugfix/all/shm-fix-shmctl(SHM_INFO)-lockup-without-CONFIG_SHMEM.patch