[kernel] r14117 - in dists/trunk/linux-2.6: . debian debian/config

[Bastian Blank]

Author: waldi
Date: Sat Aug 15 21:11:28 2009
New Revision: 14117

Log:
Merge /dists/sid/linux-2.6.

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Aug 15 21:08:49 2009	(r14116)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Aug 15 21:11:28 2009	(r14117)
@@ -65,6 +65,20 @@
 
  -- maximilian attems <maks at debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 
+linux-2.6 (2.6.30-6) unstable; urgency=high
+
+  [ Bastian Blank ]
+  * Set default low address space protection to default value.
+
+  [ dann frazier ]
+  * Make sock_sendpage() use kernel_sendpage() (CVE-2009-2692)
+  * flat: fix uninitialized ptr with shared libs
+  * [parisc] isa-eeprom - Fix loff_t usage
+  * do_sigaltstack: avoid copying 'stack_t' as a structure to user space
+  * posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 15 Aug 2009 15:50:02 +0200
+
 linux-2.6 (2.6.30-5) unstable; urgency=high
 
   [ maximilian attems ]

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sat Aug 15 21:08:49 2009	(r14116)
+++ dists/trunk/linux-2.6/debian/config/config	Sat Aug 15 21:11:28 2009	(r14117)
@@ -3454,7 +3454,7 @@
 # CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
 
 ##
 ## file: security/integrity/ima/Kconfig