| 1 |
commit: 810c5ac52bb5419588b7999d7e1f980dc91afe79 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 6 12:00:54 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 6 12:00:54 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=810c5ac5 |
| 7 |
|
| 8 |
Grsec/PaX: 3.0-3.2.59-201406052202 |
| 9 |
|
| 10 |
--- |
| 11 |
3.2.59/0000_README | 2 +- |
| 12 |
... 4420_grsecurity-3.0-3.2.59-201406052202.patch} | 24 ++++++++++++++++++---- |
| 13 |
2 files changed, 21 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/3.2.59/0000_README b/3.2.59/0000_README |
| 16 |
index d9b8617..53759a1 100644 |
| 17 |
--- a/3.2.59/0000_README |
| 18 |
+++ b/3.2.59/0000_README |
| 19 |
@@ -154,7 +154,7 @@ Patch: 1058_linux-3.2.59.patch |
| 20 |
From: http://www.kernel.org |
| 21 |
Desc: Linux 3.2.59 |
| 22 |
|
| 23 |
-Patch: 4420_grsecurity-3.0-3.2.59-201406051309.patch |
| 24 |
+Patch: 4420_grsecurity-3.0-3.2.59-201406052202.patch |
| 25 |
From: http://www.grsecurity.net |
| 26 |
Desc: hardened-sources base patch from upstream grsecurity |
| 27 |
|
| 28 |
|
| 29 |
diff --git a/3.2.59/4420_grsecurity-3.0-3.2.59-201406051309.patch b/3.2.59/4420_grsecurity-3.0-3.2.59-201406052202.patch |
| 30 |
similarity index 99% |
| 31 |
rename from 3.2.59/4420_grsecurity-3.0-3.2.59-201406051309.patch |
| 32 |
rename to 3.2.59/4420_grsecurity-3.0-3.2.59-201406052202.patch |
| 33 |
index ff8e72f..bcb5cf5 100644 |
| 34 |
--- a/3.2.59/4420_grsecurity-3.0-3.2.59-201406051309.patch |
| 35 |
+++ b/3.2.59/4420_grsecurity-3.0-3.2.59-201406052202.patch |
| 36 |
@@ -23193,10 +23193,26 @@ index 16204dc..0e7d4b7 100644 |
| 37 |
.smp_prepare_cpus = native_smp_prepare_cpus, |
| 38 |
.smp_cpus_done = native_smp_cpus_done, |
| 39 |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c |
| 40 |
-index b88eadb..ac6663c 100644 |
| 41 |
+index b88eadb..198deca 100644 |
| 42 |
--- a/arch/x86/kernel/smpboot.c |
| 43 |
+++ b/arch/x86/kernel/smpboot.c |
| 44 |
-@@ -692,7 +692,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) |
| 45 |
+@@ -252,11 +252,13 @@ notrace static void __cpuinit start_secondary(void *unused) |
| 46 |
+ preempt_disable(); |
| 47 |
+ smp_callin(); |
| 48 |
+ |
| 49 |
+-#ifdef CONFIG_X86_32 |
| 50 |
+ /* switch away from the initial page table */ |
| 51 |
++#ifdef CONFIG_PAX_PER_CPU_PGD |
| 52 |
++ load_cr3(get_cpu_pgd(smp_processor_id())); |
| 53 |
++#else |
| 54 |
+ load_cr3(swapper_pg_dir); |
| 55 |
++#endif |
| 56 |
+ __flush_tlb_all(); |
| 57 |
+-#endif |
| 58 |
+ |
| 59 |
+ /* otherwise gcc will move up smp_processor_id before the cpu_init */ |
| 60 |
+ barrier(); |
| 61 |
+@@ -692,7 +694,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) |
| 62 |
*/ |
| 63 |
if (c_idle.idle) { |
| 64 |
c_idle.idle->thread.sp = (unsigned long) (((struct pt_regs *) |
| 65 |
@@ -23205,7 +23221,7 @@ index b88eadb..ac6663c 100644 |
| 66 |
init_idle(c_idle.idle, cpu); |
| 67 |
goto do_rest; |
| 68 |
} |
| 69 |
-@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) |
| 70 |
+@@ -709,17 +711,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) |
| 71 |
set_idle_for_cpu(cpu, c_idle.idle); |
| 72 |
do_rest: |
| 73 |
per_cpu(current_task, cpu) = c_idle.idle; |
| 74 |
@@ -23229,7 +23245,7 @@ index b88eadb..ac6663c 100644 |
| 75 |
initial_code = (unsigned long)start_secondary; |
| 76 |
stack_start = c_idle.idle->thread.sp; |
| 77 |
|
| 78 |
-@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu) |
| 79 |
+@@ -861,6 +866,12 @@ int __cpuinit native_cpu_up(unsigned int cpu) |
| 80 |
|
| 81 |
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; |
Archives