diff options
| author |   Anthony G. Basile <basile@opensource.dyc.edu> | 2011-01-03 15:51:51 -0500 |
|---|---|---|
| committer | Anthony G. Basile <basile@opensource.dyc.edu> | 2011-01-03 15:51:51 -0500 |
| commit | aa4b016976f685a8139c6e43989780f447bfcf4c (patch) | |
| tree | 52b8fb45f0aa278d5b2723505e0d0b55dc7e1d5e | |
| parent | Update Grsec/PaX (diff) | |
| download | hardened-patchset-aa4b016976f685a8139c6e43989780f447bfcf4c.tar.gz hardened-patchset-aa4b016976f685a8139c6e43989780f447bfcf4c.tar.bz2 hardened-patchset-aa4b016976f685a8139c6e43989780f447bfcf4c.zip | |
Update Grsec/PaX
2.2.1-2.6.32.27-201101021130
2.2.1-2.6.36.2-201101021130
| -rw-r--r-- | 2.6.32/0000_README | 2 | ||||
| -rw-r--r-- | 2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101021130.patch (renamed from 2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101011905.patch) | 11 | ||||
| -rw-r--r-- | 2.6.36/0000_README | 2 | ||||
| -rw-r--r-- | 2.6.36/4420_grsecurity-2.2.1-2.6.36.2-201101021130.patch (renamed from 2.6.36/4420_grsecurity-2.2.1-2.6.36.2-201101011905.patch) | 11 |
4 files changed, 18 insertions, 8 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README index a505aae..94d2552 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.1-2.6.32.27-201101011905.patch +Patch: 4420_grsecurity-2.2.1-2.6.32.27-201101021130.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101011905.patch b/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101021130.patch index fe5fb59..5fd9bcc 100644 --- a/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101011905.patch +++ b/2.6.32/4420_grsecurity-2.2.1-2.6.32.27-201101021130.patch @@ -52138,7 +52138,7 @@ diff -urNp linux-2.6.32.27/kernel/posix-cpu-timers.c linux-2.6.32.27/kernel/posi #include <trace/events/timer.h> diff -urNp linux-2.6.32.27/kernel/posix-timers.c linux-2.6.32.27/kernel/posix-timers.c --- linux-2.6.32.27/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.27/kernel/posix-timers.c 2011-01-01 00:09:34.000000000 -0500 ++++ linux-2.6.32.27/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500 @@ -42,6 +42,7 @@ #include <linux/compiler.h> #include <linux/idr.h> @@ -52147,11 +52147,16 @@ diff -urNp linux-2.6.32.27/kernel/posix-timers.c linux-2.6.32.27/kernel/posix-ti #include <linux/syscalls.h> #include <linux/wait.h> #include <linux/workqueue.h> -@@ -948,6 +949,8 @@ SYSCALL_DEFINE2(clock_settime, const clo +@@ -948,6 +949,13 @@ SYSCALL_DEFINE2(clock_settime, const clo if (copy_from_user(&new_tp, tp, sizeof (*tp))) return -EFAULT; -+ gr_log_timechange(); ++ /* only the CLOCK_REALTIME clock can be set, all other clocks ++ have their clock_set fptr set to a nosettime dummy function ++ CLOCK_REALTIME has a NULL clock_set fptr which causes it to ++ call common_clock_set, which calls do_sys_settimeofday, which ++ we hook ++ */ + return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); } diff --git a/2.6.36/0000_README b/2.6.36/0000_README index dab9ff4..5da376d 100644 --- a/2.6.36/0000_README +++ b/2.6.36/0000_README @@ -3,7 +3,7 @@ README Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 4420_grsecurity-2.2.1-2.6.36.2-201101011905.patch +Patch: 4420_grsecurity-2.2.1-2.6.36.2-201101021130.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/2.6.36/4420_grsecurity-2.2.1-2.6.36.2-201101011905.patch b/2.6.36/4420_grsecurity-2.2.1-2.6.36.2-201101021130.patch index 1a6c368..741bd1f 100644 --- a/2.6.36/4420_grsecurity-2.2.1-2.6.36.2-201101011905.patch +++ b/2.6.36/4420_grsecurity-2.2.1-2.6.36.2-201101021130.patch @@ -50675,7 +50675,7 @@ diff -urNp linux-2.6.36.2/kernel/posix-cpu-timers.c linux-2.6.36.2/kernel/posix- #include <trace/events/timer.h> diff -urNp linux-2.6.36.2/kernel/posix-timers.c linux-2.6.36.2/kernel/posix-timers.c --- linux-2.6.36.2/kernel/posix-timers.c 2010-10-20 16:30:22.000000000 -0400 -+++ linux-2.6.36.2/kernel/posix-timers.c 2011-01-01 00:10:18.000000000 -0500 ++++ linux-2.6.36.2/kernel/posix-timers.c 2011-01-02 11:27:21.000000000 -0500 @@ -42,6 +42,7 @@ #include <linux/compiler.h> #include <linux/idr.h> @@ -50684,11 +50684,16 @@ diff -urNp linux-2.6.36.2/kernel/posix-timers.c linux-2.6.36.2/kernel/posix-time #include <linux/syscalls.h> #include <linux/wait.h> #include <linux/workqueue.h> -@@ -949,6 +950,8 @@ SYSCALL_DEFINE2(clock_settime, const clo +@@ -949,6 +950,13 @@ SYSCALL_DEFINE2(clock_settime, const clo if (copy_from_user(&new_tp, tp, sizeof (*tp))) return -EFAULT; -+ gr_log_timechange(); ++ /* only the CLOCK_REALTIME clock can be set, all other clocks ++ have their clock_set fptr set to a nosettime dummy function ++ CLOCK_REALTIME has a NULL clock_set fptr which causes it to ++ call common_clock_set, which calls do_sys_settimeofday, which ++ we hook ++ */ + return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); } |