diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2011-06-07 15:01:22 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2011-06-07 15:01:22 -0400 |
| commit | 9933d84fc1b507a8859ef99685b21a65beea6d4d (patch) | |
| tree | 28486d8de365e17595920dc9e6669e72ad573592 /2.6.32 | |
| parent | Update Grsec/PaX (diff) | |
| download | hardened-patchset-9933d84fc1b507a8859ef99685b21a65beea6d4d.tar.gz hardened-patchset-9933d84fc1b507a8859ef99685b21a65beea6d4d.tar.bz2 hardened-patchset-9933d84fc1b507a8859ef99685b21a65beea6d4d.zip | |
Update Grsec/PaX20110606
2.2.2-2.6.32.41-201106061735
2.2.2-2.6.39.1-201106061957
Diffstat (limited to '2.6.32')
| -rw-r--r-- | 2.6.32/0000_README | 2 | ||||
| -rw-r--r-- | 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106061735.patch (renamed from 2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch) | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README index beea0b4..f6eac50 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.41-201106042120.patch +Patch: 4420_grsecurity-2.2.2-2.6.32.41-201106061735.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.41-201106042120.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106061735.patch index 7457e1f..fe17a6f 100644 --- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106042120.patch +++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.41-201106061735.patch @@ -19708,7 +19708,7 @@ diff -urNp linux-2.6.32.41/arch/x86/mm/extable.c linux-2.6.32.41/arch/x86/mm/ext pnp_bios_is_utter_crap = 1; diff -urNp linux-2.6.32.41/arch/x86/mm/fault.c linux-2.6.32.41/arch/x86/mm/fault.c --- linux-2.6.32.41/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.41/arch/x86/mm/fault.c 2011-06-04 20:36:59.000000000 -0400 ++++ linux-2.6.32.41/arch/x86/mm/fault.c 2011-06-06 17:35:16.000000000 -0400 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -19930,10 +19930,10 @@ diff -urNp linux-2.6.32.41/arch/x86/mm/fault.c linux-2.6.32.41/arch/x86/mm/fault +#ifdef CONFIG_X86_64 + if (mm && (error_code & PF_INSTR) && mm->context.vdso) { + if (regs->ip == (unsigned long)vgettimeofday) { -+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, gettimeofday); ++ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday); + return; + } else if (regs->ip == (unsigned long)vtime) { -+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, clock_gettime); ++ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time); + return; + } else if (regs->ip == (unsigned long)vgetcpu) { + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); @@ -22488,15 +22488,15 @@ diff -urNp linux-2.6.32.41/arch/x86/vdso/vdso32-setup.c linux-2.6.32.41/arch/x86 } diff -urNp linux-2.6.32.41/arch/x86/vdso/vdso.lds.S linux-2.6.32.41/arch/x86/vdso/vdso.lds.S --- linux-2.6.32.41/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.41/arch/x86/vdso/vdso.lds.S 2011-06-04 20:37:24.000000000 -0400 ++++ linux-2.6.32.41/arch/x86/vdso/vdso.lds.S 2011-06-06 17:35:35.000000000 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" #undef VEXTERN + +#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x; -+VEXTERN(gettimeofday) -+VEXTERN(clock_gettime) ++VEXTERN(fallback_gettimeofday) ++VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN diff -urNp linux-2.6.32.41/arch/x86/vdso/vextern.h linux-2.6.32.41/arch/x86/vdso/vextern.h |