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

[Dann Frazier]

Author: dannf
Date: Sat Aug 15 00:12:58 2009
New Revision: 14112

Log:
posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/posix-timers-fix-oops-in-clock-nanosleep-with-CLOCK_MONOTONIC_RAW.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/6

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Aug 15 00:12:00 2009	(r14111)
+++ dists/sid/linux-2.6/debian/changelog	Sat Aug 15 00:12:58 2009	(r14112)
@@ -8,6 +8,7 @@
   * 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>  Fri, 14 Aug 2009 23:50:45 +0200
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/posix-timers-fix-oops-in-clock-nanosleep-with-CLOCK_MONOTONIC_RAW.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/posix-timers-fix-oops-in-clock-nanosleep-with-CLOCK_MONOTONIC_RAW.patch	Sat Aug 15 00:12:58 2009	(r14112)
@@ -0,0 +1,43 @@
+commit 70d715fd0597f18528f389b5ac59102263067744
+Author: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
+Date:   Mon Aug 3 11:48:19 2009 +0900
+
+    posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW
+    
+    Prevent calling do_nanosleep() with clockid
+    CLOCK_MONOTONIC_RAW, it may cause oops, such as NULL pointer
+    dereference.
+    
+    Signed-off-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
+    Cc: Andrew Morton <akpm at linux-foundation.org>
+    Cc: Thomas Gleixner <tglx at linutronix.de>
+    Cc: John Stultz <johnstul at us.ibm.com>
+    Cc: <stable at kernel.org>
+    LKML-Reference: <4A764FF3.50607 at ct.jp.nec.com>
+    Signed-off-by: Ingo Molnar <mingo at elte.hu>
+
+diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
+index 052ec4d..d089d05 100644
+--- a/kernel/posix-timers.c
++++ b/kernel/posix-timers.c
+@@ -202,6 +202,12 @@ static int no_timer_create(struct k_itimer *new_timer)
+ 	return -EOPNOTSUPP;
+ }
+ 
++static int no_nsleep(const clockid_t which_clock, int flags,
++		     struct timespec *tsave, struct timespec __user *rmtp)
++{
++	return -EOPNOTSUPP;
++}
++
+ /*
+  * Return nonzero if we know a priori this clockid_t value is bogus.
+  */
+@@ -254,6 +260,7 @@ static __init int init_posix_timers(void)
+ 		.clock_get = posix_get_monotonic_raw,
+ 		.clock_set = do_posix_clock_nosettime,
+ 		.timer_create = no_timer_create,
++		.nsleep = no_nsleep,
+ 	};
+ 
+ 	register_posix_clock(CLOCK_REALTIME, &clock_realtime);

Modified: dists/sid/linux-2.6/debian/patches/series/6
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/6	Sat Aug 15 00:12:00 2009	(r14111)
+++ dists/sid/linux-2.6/debian/patches/series/6	Sat Aug 15 00:12:58 2009	(r14112)
@@ -3,3 +3,4 @@
 + bugfix/parisc/isa-eeprom-fix-loff_t-usage.patch
 + bugfix/all/do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 + bugfix/all/do_sigaltstack-small-cleanups.patch
++ bugfix/all/posix-timers-fix-oops-in-clock-nanosleep-with-CLOCK_MONOTONIC_RAW.patch