Update Grsec/PaX20110806

 2.2.2-2.6.32.43-201108060941.patch
 2.2.2-2.6.39.4-201108060941.patch

4 files changed, 126 insertions, 12 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 781ce81..73494c9 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-2.6.32.43-201108052033.patch
+Patch:	4420_grsecurity-2.2.2-2.6.32.43-201108060941.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201108052033.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201108060941.patch
index 4116dc7..55e855b 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201108052033.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.43-201108060941.patch
@@ -64569,7 +64569,7 @@ diff -urNp linux-2.6.32.43/kernel/pid.c linux-2.6.32.43/kernel/pid.c
  	struct pid *pid;
 diff -urNp linux-2.6.32.43/kernel/posix-cpu-timers.c linux-2.6.32.43/kernel/posix-cpu-timers.c
 --- linux-2.6.32.43/kernel/posix-cpu-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/kernel/posix-cpu-timers.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.43/kernel/posix-cpu-timers.c	2011-08-06 09:33:44.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -64578,9 +64578,27 @@ diff -urNp linux-2.6.32.43/kernel/posix-cpu-timers.c linux-2.6.32.43/kernel/posi
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
+@@ -1697,7 +1698,7 @@ static long thread_cpu_nsleep_restart(st
+ 
+ static __init int init_posix_cpu_timers(void)
+ {
+-	struct k_clock process = {
++	static struct k_clock process = {
+ 		.clock_getres = process_cpu_clock_getres,
+ 		.clock_get = process_cpu_clock_get,
+ 		.clock_set = do_posix_clock_nosettime,
+@@ -1705,7 +1706,7 @@ static __init int init_posix_cpu_timers(
+ 		.nsleep = process_cpu_nsleep,
+ 		.nsleep_restart = process_cpu_nsleep_restart,
+ 	};
+-	struct k_clock thread = {
++	static struct k_clock thread = {
+ 		.clock_getres = thread_cpu_clock_getres,
+ 		.clock_get = thread_cpu_clock_get,
+ 		.clock_set = do_posix_clock_nosettime,
 diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-timers.c
 --- linux-2.6.32.43/kernel/posix-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.43/kernel/posix-timers.c	2011-08-05 20:33:55.000000000 -0400
++++ linux-2.6.32.43/kernel/posix-timers.c	2011-08-06 09:34:14.000000000 -0400
 @@ -42,6 +42,7 @@
  #include <linux/compiler.h>
  #include <linux/idr.h>
@@ -64618,19 +64636,56 @@ diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-ti
  	return 0;
  }
  
-@@ -217,9 +218,9 @@ static inline int invalid_clockid(const 
+@@ -217,9 +218,11 @@ static inline int invalid_clockid(const 
  		return 0;
  	if ((unsigned) which_clock >= MAX_CLOCKS)
  		return 1;
 -	if (posix_clocks[which_clock].clock_getres != NULL)
-+	if (posix_clocks[which_clock]->clock_getres != NULL)
++	if (!posix_clocks[which_clock])
  		return 0;
 -	if (posix_clocks[which_clock].res != 0)
++	if (posix_clocks[which_clock]->clock_getres != NULL)
++		return 0;
 +	if (posix_clocks[which_clock]->res != 0)
  		return 0;
  	return 1;
  }
-@@ -296,6 +297,8 @@ static __init int init_posix_timers(void
+@@ -266,29 +269,29 @@ int posix_get_coarse_res(const clockid_t
+  */
+ static __init int init_posix_timers(void)
+ {
+-	struct k_clock clock_realtime = {
++	static struct k_clock clock_realtime = {
+ 		.clock_getres = hrtimer_get_res,
+ 	};
+-	struct k_clock clock_monotonic = {
++	static struct k_clock clock_monotonic = {
+ 		.clock_getres = hrtimer_get_res,
+ 		.clock_get = posix_ktime_get_ts,
+ 		.clock_set = do_posix_clock_nosettime,
+ 	};
+-	struct k_clock clock_monotonic_raw = {
++	static struct k_clock clock_monotonic_raw = {
+ 		.clock_getres = hrtimer_get_res,
+ 		.clock_get = posix_get_monotonic_raw,
+ 		.clock_set = do_posix_clock_nosettime,
+ 		.timer_create = no_timer_create,
+ 		.nsleep = no_nsleep,
+ 	};
+-	struct k_clock clock_realtime_coarse = {
++	static struct k_clock clock_realtime_coarse = {
+ 		.clock_getres = posix_get_coarse_res,
+ 		.clock_get = posix_get_realtime_coarse,
+ 		.clock_set = do_posix_clock_nosettime,
+ 		.timer_create = no_timer_create,
+ 		.nsleep = no_nsleep,
+ 	};
+-	struct k_clock clock_monotonic_coarse = {
++	static struct k_clock clock_monotonic_coarse = {
+ 		.clock_getres = posix_get_coarse_res,
+ 		.clock_get = posix_get_monotonic_coarse,
+ 		.clock_set = do_posix_clock_nosettime,
+@@ -296,6 +299,8 @@ static __init int init_posix_timers(void
  		.nsleep = no_nsleep,
  	};
  
@@ -64639,7 +64694,7 @@ diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-ti
  	register_posix_clock(CLOCK_REALTIME, &clock_realtime);
  	register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
  	register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
-@@ -484,7 +487,7 @@ void register_posix_clock(const clockid_
+@@ -484,7 +489,7 @@ void register_posix_clock(const clockid_
  		return;
  	}
  
@@ -64648,7 +64703,7 @@ diff -urNp linux-2.6.32.43/kernel/posix-timers.c linux-2.6.32.43/kernel/posix-ti
  }
  EXPORT_SYMBOL_GPL(register_posix_clock);
  
-@@ -948,6 +951,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
+@@ -948,6 +953,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
  	if (copy_from_user(&new_tp, tp, sizeof (*tp)))
  		return -EFAULT;
  
diff --git a/2.6.39/0000_README b/2.6.39/0000_README
index c7b2f4b..bcdc911 100644
--- a/2.6.39/0000_README
+++ b/2.6.39/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-2.6.39.4-201108052113.patch
+Patch:	4420_grsecurity-2.2.2-2.6.39.4-201108060941.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.39/4420_grsecurity-2.2.2-2.6.39.4-201108052113.patch b/2.6.39/4420_grsecurity-2.2.2-2.6.39.4-201108060941.patch
index 6d7cdae..827cb17 100644
--- a/2.6.39/4420_grsecurity-2.2.2-2.6.39.4-201108052113.patch
+++ b/2.6.39/4420_grsecurity-2.2.2-2.6.39.4-201108060941.patch
@@ -58474,7 +58474,7 @@ diff -urNp linux-2.6.39.4/kernel/pid.c linux-2.6.39.4/kernel/pid.c
  	struct pid *pid;
 diff -urNp linux-2.6.39.4/kernel/posix-cpu-timers.c linux-2.6.39.4/kernel/posix-cpu-timers.c
 --- linux-2.6.39.4/kernel/posix-cpu-timers.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.4/kernel/posix-cpu-timers.c	2011-08-05 20:34:06.000000000 -0400
++++ linux-2.6.39.4/kernel/posix-cpu-timers.c	2011-08-06 09:34:48.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -58483,9 +58483,26 @@ diff -urNp linux-2.6.39.4/kernel/posix-cpu-timers.c linux-2.6.39.4/kernel/posix-
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
+@@ -1604,14 +1605,14 @@ struct k_clock clock_posix_cpu = {
+ 
+ static __init int init_posix_cpu_timers(void)
+ {
+-	struct k_clock process = {
++	static struct k_clock process = {
+ 		.clock_getres	= process_cpu_clock_getres,
+ 		.clock_get	= process_cpu_clock_get,
+ 		.timer_create	= process_cpu_timer_create,
+ 		.nsleep		= process_cpu_nsleep,
+ 		.nsleep_restart	= process_cpu_nsleep_restart,
+ 	};
+-	struct k_clock thread = {
++	static struct k_clock thread = {
+ 		.clock_getres	= thread_cpu_clock_getres,
+ 		.clock_get	= thread_cpu_clock_get,
+ 		.timer_create	= thread_cpu_timer_create,
 diff -urNp linux-2.6.39.4/kernel/posix-timers.c linux-2.6.39.4/kernel/posix-timers.c
 --- linux-2.6.39.4/kernel/posix-timers.c	2011-05-19 00:06:34.000000000 -0400
-+++ linux-2.6.39.4/kernel/posix-timers.c	2011-08-05 20:34:06.000000000 -0400
++++ linux-2.6.39.4/kernel/posix-timers.c	2011-08-06 09:30:46.000000000 -0400
 @@ -43,6 +43,7 @@
  #include <linux/idr.h>
  #include <linux/posix-clock.h>
@@ -58503,6 +58520,48 @@ diff -urNp linux-2.6.39.4/kernel/posix-timers.c linux-2.6.39.4/kernel/posix-time
  
  /*
   * These ones are defined below.
+@@ -227,7 +228,7 @@ static int posix_get_boottime(const cloc
+  */
+ static __init int init_posix_timers(void)
+ {
+-	struct k_clock clock_realtime = {
++	static struct k_clock clock_realtime = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_clock_realtime_get,
+ 		.clock_set	= posix_clock_realtime_set,
+@@ -239,7 +240,7 @@ static __init int init_posix_timers(void
+ 		.timer_get	= common_timer_get,
+ 		.timer_del	= common_timer_del,
+ 	};
+-	struct k_clock clock_monotonic = {
++	static struct k_clock clock_monotonic = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_ktime_get_ts,
+ 		.nsleep		= common_nsleep,
+@@ -249,19 +250,19 @@ static __init int init_posix_timers(void
+ 		.timer_get	= common_timer_get,
+ 		.timer_del	= common_timer_del,
+ 	};
+-	struct k_clock clock_monotonic_raw = {
++	static struct k_clock clock_monotonic_raw = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_get_monotonic_raw,
+ 	};
+-	struct k_clock clock_realtime_coarse = {
++	static struct k_clock clock_realtime_coarse = {
+ 		.clock_getres	= posix_get_coarse_res,
+ 		.clock_get	= posix_get_realtime_coarse,
+ 	};
+-	struct k_clock clock_monotonic_coarse = {
++	static struct k_clock clock_monotonic_coarse = {
+ 		.clock_getres	= posix_get_coarse_res,
+ 		.clock_get	= posix_get_monotonic_coarse,
+ 	};
+-	struct k_clock clock_boottime = {
++	static struct k_clock clock_boottime = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_get_boottime,
+ 		.nsleep		= common_nsleep,
 @@ -272,6 +273,8 @@ static __init int init_posix_timers(void
  		.timer_del	= common_timer_del,
  	};
@@ -58526,7 +58585,7 @@ diff -urNp linux-2.6.39.4/kernel/posix-timers.c linux-2.6.39.4/kernel/posix-time
  			&clock_posix_dynamic : &clock_posix_cpu;
  
 -	if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
-+	if (id >= MAX_CLOCKS || !posix_clocks[id]->clock_getres)
++	if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
  		return NULL;
 -	return &posix_clocks[id];
 +	return posix_clocks[id];