Author: hawk Date: Sat Jun 23 17:18:45 2007 GMT
Module: SOURCES Tag: hawk-LINUX_2_6
---- Log message:
- updated from
http://www.grsecurity.net/~spender/grsecurity-2.1.10-2.6.21.5-200706182032.patch
---- Files affected:
SOURCES:
linux-2.6-grsec-full.patch (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-grsec-full.patch
diff -u SOURCES/linux-2.6-grsec-full.patch:1.1.2.2
SOURCES/linux-2.6-grsec-full.patch:1.1.2.3
--- SOURCES/linux-2.6-grsec-full.patch:1.1.2.2 Sat Jun 9 09:27:36 2007
+++ SOURCES/linux-2.6-grsec-full.patch Sat Jun 23 19:18:40 2007
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.21.3/arch/alpha/kernel/module.c
linux-2.6.21.3/arch/alpha/kernel/module.c
---- linux-2.6.21.3/arch/alpha/kernel/module.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/alpha/kernel/module.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/alpha/kernel/module.c
linux-2.6.21.5/arch/alpha/kernel/module.c
+--- linux-2.6.21.5/arch/alpha/kernel/module.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/alpha/kernel/module.c 2007-05-24 22:04:52.000000000
-0400
@@ -177,7 +177,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -10,9 +10,9 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.21.3/arch/alpha/kernel/osf_sys.c
linux-2.6.21.3/arch/alpha/kernel/osf_sys.c
---- linux-2.6.21.3/arch/alpha/kernel/osf_sys.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/alpha/kernel/osf_sys.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/alpha/kernel/osf_sys.c
linux-2.6.21.5/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.21.5/arch/alpha/kernel/osf_sys.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/alpha/kernel/osf_sys.c 2007-05-24 22:04:52.000000000
-0400
@@ -1277,6 +1277,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -35,9 +35,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.21.3/arch/alpha/kernel/ptrace.c
linux-2.6.21.3/arch/alpha/kernel/ptrace.c
---- linux-2.6.21.3/arch/alpha/kernel/ptrace.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/alpha/kernel/ptrace.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/alpha/kernel/ptrace.c
linux-2.6.21.5/arch/alpha/kernel/ptrace.c
+--- linux-2.6.21.5/arch/alpha/kernel/ptrace.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/alpha/kernel/ptrace.c 2007-05-24 22:04:52.000000000
-0400
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -56,9 +56,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -urNp linux-2.6.21.3/arch/alpha/mm/fault.c
linux-2.6.21.3/arch/alpha/mm/fault.c
---- linux-2.6.21.3/arch/alpha/mm/fault.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/alpha/mm/fault.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/alpha/mm/fault.c
linux-2.6.21.5/arch/alpha/mm/fault.c
+--- linux-2.6.21.5/arch/alpha/mm/fault.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/alpha/mm/fault.c 2007-05-24 22:04:52.000000000
-0400
@@ -24,6 +24,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -223,9 +223,9 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.21.3/arch/arm/mm/mmap.c linux-2.6.21.3/arch/arm/mm/mmap.c
---- linux-2.6.21.3/arch/arm/mm/mmap.c 2007-04-25 23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/arm/mm/mmap.c 2007-05-24 22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/arm/mm/mmap.c linux-2.6.21.5/arch/arm/mm/mmap.c
+--- linux-2.6.21.5/arch/arm/mm/mmap.c 2007-04-25 23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/arm/mm/mmap.c 2007-05-24 22:04:52.000000000 -0400
@@ -61,6 +61,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -257,9 +257,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.21.3/arch/avr32/mm/fault.c
linux-2.6.21.3/arch/avr32/mm/fault.c
---- linux-2.6.21.3/arch/avr32/mm/fault.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/avr32/mm/fault.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/avr32/mm/fault.c
linux-2.6.21.5/arch/avr32/mm/fault.c
+--- linux-2.6.21.5/arch/avr32/mm/fault.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/avr32/mm/fault.c 2007-05-24 22:04:52.000000000
-0400
@@ -68,6 +68,23 @@ static inline int notify_page_fault(enum
}
#endif
@@ -301,9 +301,9 @@
/* Hmm...we have to pass address and ecr somehow... */
/* tsk->thread.address = address;
tsk->thread.error_code = ecr; */
-diff -urNp linux-2.6.21.3/arch/i386/boot/setup.S
linux-2.6.21.3/arch/i386/boot/setup.S
---- linux-2.6.21.3/arch/i386/boot/setup.S 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/boot/setup.S 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/boot/setup.S
linux-2.6.21.5/arch/i386/boot/setup.S
+--- linux-2.6.21.5/arch/i386/boot/setup.S 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/boot/setup.S 2007-05-24 22:04:52.000000000
-0400
@@ -869,11 +869,13 @@ startup_32:
movl %eax, %gs
movl %eax, %ss
@@ -318,9 +318,9 @@
# Jump to the 32bit entry point
jmpl *(code32_start - start + (DELTA_INITSEG << 4))(%esi)
-diff -urNp linux-2.6.21.3/arch/i386/Kconfig linux-2.6.21.3/arch/i386/Kconfig
---- linux-2.6.21.3/arch/i386/Kconfig 2007-04-25 23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/Kconfig 2007-06-01 22:13:13.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/Kconfig linux-2.6.21.5/arch/i386/Kconfig
+--- linux-2.6.21.5/arch/i386/Kconfig 2007-04-25 23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/Kconfig 2007-06-01 22:13:13.000000000 -0400
@@ -578,7 +578,7 @@ endchoice
config PAGE_OFFSET
hex
@@ -357,9 +357,9 @@
default y
config PCI_DIRECT
-diff -urNp linux-2.6.21.3/arch/i386/Kconfig.cpu
linux-2.6.21.3/arch/i386/Kconfig.cpu
---- linux-2.6.21.3/arch/i386/Kconfig.cpu 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/Kconfig.cpu 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/Kconfig.cpu
linux-2.6.21.5/arch/i386/Kconfig.cpu
+--- linux-2.6.21.5/arch/i386/Kconfig.cpu 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/Kconfig.cpu 2007-05-24 22:04:52.000000000
-0400
@@ -262,7 +262,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -378,9 +378,9 @@
default y
config X86_GOOD_APIC
-diff -urNp linux-2.6.21.3/arch/i386/Kconfig.debug
linux-2.6.21.3/arch/i386/Kconfig.debug
---- linux-2.6.21.3/arch/i386/Kconfig.debug 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/Kconfig.debug 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/Kconfig.debug
linux-2.6.21.5/arch/i386/Kconfig.debug
+--- linux-2.6.21.5/arch/i386/Kconfig.debug 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/Kconfig.debug 2007-05-24 22:04:52.000000000
-0400
@@ -48,7 +48,7 @@ config DEBUG_PAGEALLOC
config DEBUG_RODATA
@@ -390,9 +390,9 @@
help
Mark the kernel read-only data as write-protected in the pagetables,
in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.21.3/arch/i386/kernel/acpi/boot.c
linux-2.6.21.3/arch/i386/kernel/acpi/boot.c
---- linux-2.6.21.3/arch/i386/kernel/acpi/boot.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/acpi/boot.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/acpi/boot.c
linux-2.6.21.5/arch/i386/kernel/acpi/boot.c
+--- linux-2.6.21.5/arch/i386/kernel/acpi/boot.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/acpi/boot.c 2007-05-24
22:04:52.000000000 -0400
@@ -1116,7 +1116,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
},
@@ -402,9 +402,9 @@
};
#endif /* __i386__ */
-diff -urNp linux-2.6.21.3/arch/i386/kernel/acpi/sleep.c
linux-2.6.21.3/arch/i386/kernel/acpi/sleep.c
---- linux-2.6.21.3/arch/i386/kernel/acpi/sleep.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/acpi/sleep.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/acpi/sleep.c
linux-2.6.21.5/arch/i386/kernel/acpi/sleep.c
+--- linux-2.6.21.5/arch/i386/kernel/acpi/sleep.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/acpi/sleep.c 2007-05-24
22:04:52.000000000 -0400
@@ -94,7 +94,7 @@ static __initdata struct dmi_system_id a
DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
},
@@ -414,9 +414,9 @@
};
static int __init acpisleep_dmi_init(void)
-diff -urNp linux-2.6.21.3/arch/i386/kernel/acpi/wakeup.S
linux-2.6.21.3/arch/i386/kernel/acpi/wakeup.S
---- linux-2.6.21.3/arch/i386/kernel/acpi/wakeup.S 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/acpi/wakeup.S 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/acpi/wakeup.S
linux-2.6.21.5/arch/i386/kernel/acpi/wakeup.S
+--- linux-2.6.21.5/arch/i386/kernel/acpi/wakeup.S 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/acpi/wakeup.S 2007-05-24
22:04:52.000000000 -0400
@@ -205,13 +205,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -433,9 +433,9 @@
bogus_magic:
movw $0x0e00 + 'B', 0xb8018
-diff -urNp linux-2.6.21.3/arch/i386/kernel/alternative.c
linux-2.6.21.3/arch/i386/kernel/alternative.c
---- linux-2.6.21.3/arch/i386/kernel/alternative.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/alternative.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/alternative.c
linux-2.6.21.5/arch/i386/kernel/alternative.c
+--- linux-2.6.21.5/arch/i386/kernel/alternative.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/alternative.c 2007-05-24
22:04:52.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/list.h>
#include <asm/alternative.h>
@@ -628,9 +628,9 @@
/* Sync to be conservative, in case we patched following instructions */
sync_core();
}
-diff -urNp linux-2.6.21.3/arch/i386/kernel/apm.c
linux-2.6.21.3/arch/i386/kernel/apm.c
---- linux-2.6.21.3/arch/i386/kernel/apm.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/apm.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/apm.c
linux-2.6.21.5/arch/i386/kernel/apm.c
+--- linux-2.6.21.5/arch/i386/kernel/apm.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/apm.c 2007-05-24 22:04:52.000000000
-0400
@@ -236,7 +236,7 @@
#include "io_ports.h"
@@ -970,9 +970,9 @@
};
/*
-diff -urNp linux-2.6.21.3/arch/i386/kernel/asm-offsets.c
linux-2.6.21.3/arch/i386/kernel/asm-offsets.c
---- linux-2.6.21.3/arch/i386/kernel/asm-offsets.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/asm-offsets.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/asm-offsets.c
linux-2.6.21.5/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.21.5/arch/i386/kernel/asm-offsets.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/asm-offsets.c 2007-05-24
22:04:52.000000000 -0400
@@ -16,6 +16,7 @@
#include <asm/thread_info.h>
#include <asm/elf.h>
@@ -1012,9 +1012,9 @@
+ OFFSET(PARAVIRT_write_cr0, paravirt_ops, write_cr0);
#endif
}
-diff -urNp linux-2.6.21.3/arch/i386/kernel/cpu/common.c
linux-2.6.21.3/arch/i386/kernel/cpu/common.c
---- linux-2.6.21.3/arch/i386/kernel/cpu/common.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/cpu/common.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/cpu/common.c
linux-2.6.21.5/arch/i386/kernel/cpu/common.c
+--- linux-2.6.21.5/arch/i386/kernel/cpu/common.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/cpu/common.c 2007-06-18
18:29:52.000000000 -0400
@@ -4,7 +4,6 @@
#include <linux/smp.h>
#include <linux/module.h>
@@ -1139,7 +1139,7 @@
(u32 *)&gdt[GDT_ENTRY_PDA].b,
(unsigned long)pda, sizeof(*pda) - 1,
- 0x80 | DESCTYPE_S | 0x2, 0); /* present read-write data
segment */
-+ 0x80 | DESCTYPE_S | 0x3, 0); /* present read-write
accessed data segment */
++ 0x80 | DESCTYPE_S | 0x3, 0x4); /* present read-write
accessed data segment */
- memset(pda, 0, sizeof(*pda));
- pda->_pda = pda;
@@ -1184,9 +1184,9 @@
cpu_set_gdt(cpu);
_cpu_init(cpu, curr);
}
-diff -urNp linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2007-05-24
22:04:52.000000000 -0400
@@ -563,7 +563,7 @@ static struct dmi_system_id sw_any_bug_d
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -1196,9 +1196,9 @@
};
#endif
-diff -urNp linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
2007-04-25 23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
2007-05-24 22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
2007-04-25 23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
2007-05-24 22:04:52.000000000 -0400
@@ -229,7 +229,7 @@ static struct cpu_model models[] =
{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -1217,9 +1217,9 @@
};
#endif
-diff -urNp linux-2.6.21.3/arch/i386/kernel/cpu/mcheck/therm_throt.c
linux-2.6.21.3/arch/i386/kernel/cpu/mcheck/therm_throt.c
---- linux-2.6.21.3/arch/i386/kernel/cpu/mcheck/therm_throt.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/cpu/mcheck/therm_throt.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/cpu/mcheck/therm_throt.c
linux-2.6.21.5/arch/i386/kernel/cpu/mcheck/therm_throt.c
+--- linux-2.6.21.5/arch/i386/kernel/cpu/mcheck/therm_throt.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/cpu/mcheck/therm_throt.c 2007-05-24
22:04:52.000000000 -0400
@@ -148,7 +148,7 @@ static __cpuinit int thermal_throttle_cp
return NOTIFY_OK;
}
@@ -1229,9 +1229,9 @@
{
.notifier_call = thermal_throttle_cpu_callback,
};
-diff -urNp linux-2.6.21.3/arch/i386/kernel/cpu/mtrr/generic.c
linux-2.6.21.3/arch/i386/kernel/cpu/mtrr/generic.c
---- linux-2.6.21.3/arch/i386/kernel/cpu/mtrr/generic.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/cpu/mtrr/generic.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/cpu/mtrr/generic.c
linux-2.6.21.5/arch/i386/kernel/cpu/mtrr/generic.c
+--- linux-2.6.21.5/arch/i386/kernel/cpu/mtrr/generic.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/cpu/mtrr/generic.c 2007-05-24
22:04:52.000000000 -0400
@@ -21,7 +21,7 @@ struct mtrr_state {
};
@@ -1241,9 +1241,9 @@
#undef MODULE_PARAM_PREFIX
#define MODULE_PARAM_PREFIX "mtrr."
-diff -urNp linux-2.6.21.3/arch/i386/kernel/crash.c
linux-2.6.21.3/arch/i386/kernel/crash.c
---- linux-2.6.21.3/arch/i386/kernel/crash.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/crash.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/crash.c
linux-2.6.21.5/arch/i386/kernel/crash.c
+--- linux-2.6.21.5/arch/i386/kernel/crash.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/crash.c 2007-05-24 22:04:52.000000000
-0400
@@ -55,7 +55,7 @@ static int crash_nmi_callback(struct not
return NOTIFY_STOP;
local_irq_disable();
@@ -1253,9 +1253,9 @@
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.21.3/arch/i386/kernel/doublefault.c
linux-2.6.21.3/arch/i386/kernel/doublefault.c
---- linux-2.6.21.3/arch/i386/kernel/doublefault.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/doublefault.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/doublefault.c
linux-2.6.21.5/arch/i386/kernel/doublefault.c
+--- linux-2.6.21.5/arch/i386/kernel/doublefault.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/doublefault.c 2007-05-24
22:04:52.000000000 -0400
@@ -11,17 +11,17 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -1290,9 +1290,9 @@
.__cr3 = __pa(swapper_pg_dir)
};
-diff -urNp linux-2.6.21.3/arch/i386/kernel/efi.c
linux-2.6.21.3/arch/i386/kernel/efi.c
---- linux-2.6.21.3/arch/i386/kernel/efi.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/efi.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/efi.c
linux-2.6.21.5/arch/i386/kernel/efi.c
+--- linux-2.6.21.5/arch/i386/kernel/efi.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/efi.c 2007-05-24 22:04:52.000000000
-0400
@@ -63,82 +63,43 @@ extern void * boot_ioremap(unsigned long
static unsigned long efi_rt_eflags;
@@ -1397,9 +1397,9 @@
phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
{
efi_status_t status;
-diff -urNp linux-2.6.21.3/arch/i386/kernel/efi_stub.S
linux-2.6.21.3/arch/i386/kernel/efi_stub.S
---- linux-2.6.21.3/arch/i386/kernel/efi_stub.S 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/efi_stub.S 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/efi_stub.S
linux-2.6.21.5/arch/i386/kernel/efi_stub.S
+--- linux-2.6.21.5/arch/i386/kernel/efi_stub.S 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/efi_stub.S 2007-05-24 22:04:52.000000000
-0400
@@ -6,6 +6,7 @@
*/
@@ -1502,9 +1502,9 @@
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.21.3/arch/i386/kernel/entry.S
linux-2.6.21.3/arch/i386/kernel/entry.S
---- linux-2.6.21.3/arch/i386/kernel/entry.S 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/entry.S 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/entry.S
linux-2.6.21.5/arch/i386/kernel/entry.S
+--- linux-2.6.21.5/arch/i386/kernel/entry.S 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/entry.S 2007-05-24 22:04:52.000000000
-0400
@@ -49,7 +49,6 @@
#include <asm/smp.h>
#include <asm/page.h>
@@ -1728,9 +1728,9 @@
#include "syscall_table.S"
syscall_table_size=(.-sys_call_table)
-diff -urNp linux-2.6.21.3/arch/i386/kernel/head.S
linux-2.6.21.3/arch/i386/kernel/head.S
---- linux-2.6.21.3/arch/i386/kernel/head.S 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/head.S 2007-06-01 22:13:13.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/head.S
linux-2.6.21.5/arch/i386/kernel/head.S
+--- linux-2.6.21.5/arch/i386/kernel/head.S 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/head.S 2007-06-18 18:29:52.000000000
-0400
@@ -45,6 +45,16 @@
*/
#define INIT_MAP_BEYOND_END (128*1024)
@@ -1779,7 +1779,7 @@
+#endif
+
+#ifdef CONFIG_PAX_KERNEXEC
-+ movl $ __KERNEL_TEXT_OFFSET,%eax
++ movl $__KERNEL_TEXT_OFFSET,%eax
+ movw %ax,(cpu_gdt_table - __PAGE_OFFSET + __KERNEL_CS + 2)
+ rorl $16,%eax
+ movb %al,(cpu_gdt_table - __PAGE_OFFSET + __KERNEL_CS + 4)
@@ -1801,9 +1801,9 @@
-page_pde_offset = (__PAGE_OFFSET >> 20);
-
+#ifdef CONFIG_X86_PAE
-+page_pde_offset = ((__PAGE_OFFSET >> 21) * (4096 / PTRS_PER_PTE_asm));
++page_pde_offset = ((__PAGE_OFFSET >> 21) * (PAGE_SIZE_asm /
PTRS_PER_PTE_asm));
+#else
-+page_pde_offset = ((__PAGE_OFFSET >> 22) * (4096 / PTRS_PER_PTE_asm));
++page_pde_offset = ((__PAGE_OFFSET >> 22) * (PAGE_SIZE_asm /
PTRS_PER_PTE_asm));
+#endif
movl $(pg0 - __PAGE_OFFSET), %edi
+#ifdef CONFIG_X86_PAE
@@ -2148,9 +2148,9 @@
+#ifdef CONFIG_SMP
+ .fill (NR_CPUS-1) * (PAGE_SIZE_asm / 8),8,0 /* other CPU's GDT */
+#endif
-diff -urNp linux-2.6.21.3/arch/i386/kernel/i386_ksyms.c
linux-2.6.21.3/arch/i386/kernel/i386_ksyms.c
---- linux-2.6.21.3/arch/i386/kernel/i386_ksyms.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/i386_ksyms.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/i386_ksyms.c
linux-2.6.21.5/arch/i386/kernel/i386_ksyms.c
+--- linux-2.6.21.5/arch/i386/kernel/i386_ksyms.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/i386_ksyms.c 2007-05-24
22:04:52.000000000 -0400
@@ -2,12 +2,16 @@
#include <asm/checksum.h>
#include <asm/desc.h>
@@ -2168,9 +2168,9 @@
EXPORT_SYMBOL(__get_user_1);
EXPORT_SYMBOL(__get_user_2);
-diff -urNp linux-2.6.21.3/arch/i386/kernel/i8259.c
linux-2.6.21.3/arch/i386/kernel/i8259.c
---- linux-2.6.21.3/arch/i386/kernel/i8259.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/i8259.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/i8259.c
linux-2.6.21.5/arch/i386/kernel/i8259.c
+--- linux-2.6.21.5/arch/i386/kernel/i8259.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/i8259.c 2007-05-24 22:04:52.000000000
-0400
@@ -351,7 +351,7 @@ static irqreturn_t math_error_irq(int cp
* New motherboards sometimes make IRQ 13 be a PCI interrupt,
* so allow interrupt sharing.
@@ -2180,9 +2180,9 @@
void __init init_ISA_irqs (void)
{
-diff -urNp linux-2.6.21.3/arch/i386/kernel/init_task.c
linux-2.6.21.3/arch/i386/kernel/init_task.c
---- linux-2.6.21.3/arch/i386/kernel/init_task.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/init_task.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/init_task.c
linux-2.6.21.5/arch/i386/kernel/init_task.c
+--- linux-2.6.21.5/arch/i386/kernel/init_task.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/init_task.c 2007-05-24
22:04:52.000000000 -0400
@@ -42,5 +42,5 @@ EXPORT_SYMBOL(init_task);
* per-CPU TSS segments. Threads are completely 'soft' on Linux,
* no more per-task TSS's.
@@ -2190,9 +2190,9 @@
-DEFINE_PER_CPU(struct tss_struct, init_tss)
____cacheline_internodealigned_in_smp = INIT_TSS;
+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = {
[0 ... NR_CPUS-1] = INIT_TSS };
-diff -urNp linux-2.6.21.3/arch/i386/kernel/io_apic.c
linux-2.6.21.3/arch/i386/kernel/io_apic.c
---- linux-2.6.21.3/arch/i386/kernel/io_apic.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/io_apic.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/io_apic.c
linux-2.6.21.5/arch/i386/kernel/io_apic.c
+--- linux-2.6.21.5/arch/i386/kernel/io_apic.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/io_apic.c 2007-05-24 22:04:52.000000000
-0400
@@ -357,8 +357,8 @@ static void set_ioapic_affinity_irq(unsi
# define TDprintk(x...) do { printk("<%ld:%s:%d>: ", jiffies, __FILE__,
__LINE__); printk(x); } while (0)
# define Dprintk(x...) do { TDprintk(x); } while (0)
@@ -2204,9 +2204,9 @@
# endif
#define IRQBALANCE_CHECK_ARCH -999
-diff -urNp linux-2.6.21.3/arch/i386/kernel/ioport.c
linux-2.6.21.3/arch/i386/kernel/ioport.c
---- linux-2.6.21.3/arch/i386/kernel/ioport.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/ioport.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/ioport.c
linux-2.6.21.5/arch/i386/kernel/ioport.c
+--- linux-2.6.21.5/arch/i386/kernel/ioport.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/ioport.c 2007-05-24 22:04:52.000000000
-0400
@@ -16,6 +16,7 @@
#include <linux/stddef.h>
#include <linux/slab.h>
@@ -2256,9 +2256,9 @@
}
t->iopl = level << 12;
regs->eflags = (regs->eflags & ~X86_EFLAGS_IOPL) | t->iopl;
-diff -urNp linux-2.6.21.3/arch/i386/kernel/irq.c
linux-2.6.21.3/arch/i386/kernel/irq.c
---- linux-2.6.21.3/arch/i386/kernel/irq.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/irq.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/irq.c
linux-2.6.21.5/arch/i386/kernel/irq.c
+--- linux-2.6.21.5/arch/i386/kernel/irq.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/irq.c 2007-05-24 22:04:52.000000000
-0400
@@ -114,7 +114,7 @@ fastcall unsigned int do_IRQ(struct pt_r
int arg1, arg2, ebx;
@@ -2290,9 +2290,9 @@
asm volatile(
" xchgl %%ebx,%%esp \n"
-diff -urNp linux-2.6.21.3/arch/i386/kernel/kprobes.c
linux-2.6.21.3/arch/i386/kernel/kprobes.c
---- linux-2.6.21.3/arch/i386/kernel/kprobes.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/kprobes.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/kprobes.c
linux-2.6.21.5/arch/i386/kernel/kprobes.c
+--- linux-2.6.21.5/arch/i386/kernel/kprobes.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/kprobes.c 2007-05-24 22:04:52.000000000
-0400
@@ -661,7 +661,7 @@ int __kprobes kprobe_exceptions_notify(s
struct die_args *args = (struct die_args *)data;
int ret = NOTIFY_DONE;
@@ -2302,9 +2302,9 @@
return ret;
switch (val) {
-diff -urNp linux-2.6.21.3/arch/i386/kernel/ldt.c
linux-2.6.21.3/arch/i386/kernel/ldt.c
---- linux-2.6.21.3/arch/i386/kernel/ldt.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/ldt.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/ldt.c
linux-2.6.21.5/arch/i386/kernel/ldt.c
+--- linux-2.6.21.5/arch/i386/kernel/ldt.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/ldt.c 2007-05-24 22:04:52.000000000
-0400
@@ -103,6 +103,22 @@ int init_new_context(struct task_struct
retval = copy_ldt(&mm->context, &old_mm->context);
up(&old_mm->context.sem);
@@ -2342,9 +2342,9 @@
entry_1 = LDT_entry_a(&ldt_info);
entry_2 = LDT_entry_b(&ldt_info);
if (oldmode)
-diff -urNp linux-2.6.21.3/arch/i386/kernel/machine_kexec.c
linux-2.6.21.3/arch/i386/kernel/machine_kexec.c
---- linux-2.6.21.3/arch/i386/kernel/machine_kexec.c 2007-04-25
23:08:32.000000000 -0400
-+++ linux-2.6.21.3/arch/i386/kernel/machine_kexec.c 2007-05-24
22:04:52.000000000 -0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/machine_kexec.c
linux-2.6.21.5/arch/i386/kernel/machine_kexec.c
+--- linux-2.6.21.5/arch/i386/kernel/machine_kexec.c 2007-04-25
23:08:32.000000000 -0400
++++ linux-2.6.21.5/arch/i386/kernel/machine_kexec.c 2007-05-24
22:04:52.000000000 -0400
@@ -29,25 +29,25 @@ static u32 kexec_pmd1[1024] PAGE_ALIGNED
static u32 kexec_pte0[1024] PAGE_ALIGNED;
static u32 kexec_pte1[1024] PAGE_ALIGNED;
@@ -2375,9 +2375,9 @@
load_gdt(&curgdt);
};
-diff -urNp linux-2.6.21.3/arch/i386/kernel/module.c
linux-2.6.21.3/arch/i386/kernel/module.c
---- linux-2.6.21.3/arch/i386/kernel/module.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/module.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/module.c
linux-2.6.21.5/arch/i386/kernel/module.c
+--- linux-2.6.21.5/arch/i386/kernel/module.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/module.c 2007-05-24 22:04:52.000000000
-0400
@@ -23,6 +23,8 @@
#include <linux/kernel.h>
#include <linux/bug.h>
@@ -2498,9 +2498,9 @@
break;
default:
printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-diff -urNp linux-2.6.21.3/arch/i386/kernel/paravirt.c
linux-2.6.21.3/arch/i386/kernel/paravirt.c
---- linux-2.6.21.3/arch/i386/kernel/paravirt.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/paravirt.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/paravirt.c
linux-2.6.21.5/arch/i386/kernel/paravirt.c
+--- linux-2.6.21.5/arch/i386/kernel/paravirt.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/paravirt.c 2007-05-24 22:04:52.000000000
-0400
@@ -89,7 +89,7 @@ static unsigned native_patch(u8 type, u1
if (len < insn_len)
return len;
@@ -2560,9 +2560,9 @@
.name = "bare hardware",
.paravirt_enabled = 0,
.kernel_rpl = 0,
-diff -urNp linux-2.6.21.3/arch/i386/kernel/process.c
linux-2.6.21.3/arch/i386/kernel/process.c
---- linux-2.6.21.3/arch/i386/kernel/process.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/process.c 2007-05-25 05:00:26.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/process.c
linux-2.6.21.5/arch/i386/kernel/process.c
+--- linux-2.6.21.5/arch/i386/kernel/process.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/process.c 2007-05-25 05:00:26.000000000
-0400
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(boot_option_idle_override)
*/
unsigned long thread_saved_pc(struct task_struct *tsk)
@@ -2697,9 +2697,9 @@
+ current->thread.esp0 = tss->esp0;
}
+#endif
-diff -urNp linux-2.6.21.3/arch/i386/kernel/ptrace.c
linux-2.6.21.3/arch/i386/kernel/ptrace.c
---- linux-2.6.21.3/arch/i386/kernel/ptrace.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/ptrace.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/ptrace.c
linux-2.6.21.5/arch/i386/kernel/ptrace.c
+--- linux-2.6.21.5/arch/i386/kernel/ptrace.c 2007-04-25 23:08:32.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/ptrace.c 2007-05-24 22:04:52.000000000
-0400
@@ -17,6 +17,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
@@ -2767,9 +2767,9 @@
/* Send us the fakey SIGTRAP */
force_sig_info(SIGTRAP, &info, tsk);
-diff -urNp linux-2.6.21.3/arch/i386/kernel/reboot.c
linux-2.6.21.3/arch/i386/kernel/reboot.c
---- linux-2.6.21.3/arch/i386/kernel/reboot.c 2007-04-25 23:08:32.000000000
-0400
-+++ linux-2.6.21.3/arch/i386/kernel/reboot.c 2007-05-24 22:04:52.000000000
-0400
+diff -urNp linux-2.6.21.5/arch/i386/kernel/reboot.c
linux-2.6.21.5/arch/i386/kernel/reboot.c
+--- linux-2.6.21.5/arch/i386/kernel/reboot.c 2007-06-18 18:28:31.000000000
-0400
++++ linux-2.6.21.5/arch/i386/kernel/reboot.c 2007-06-18 18:32:27.000000000
-0400
@@ -25,7 +25,7 @@
void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -2779,7 +2779,7 @@
static int reboot_thru_bios;
#ifdef CONFIG_SMP
-@@ -120,7 +120,7 @@ static struct dmi_system_id __initdata r
+@@ -128,7 +128,7 @@ static struct dmi_system_id __initdata r
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
},
},
@@ -2788,7 +2788,7 @@
};
static int __init reboot_init(void)
-@@ -138,18 +138,18 @@ core_initcall(reboot_init);
+@@ -146,18 +146,18 @@ core_initcall(reboot_init);
doesn't work with at least one type of 486 motherboard. It is easy
to stop this code working; hence the copious comments. */
@@ -2815,7 +2815,7 @@
/* This is 16-bit protected mode code to disable paging and the cache,
-@@ -171,7 +171,7 @@ no_idt = { 0, 0 };
+@@ -179,7 +179,7 @@ no_idt = { 0, 0 };
More could be done here to set up the registers as if a CPU reset had
occurred; hopefully real BIOSs don't assume much. */
@@ -2824,7 +2824,7 @@
{
0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */
0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */
-@@ -185,7 +185,7 @@ static unsigned char real_mode_switch []
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-grsec-full.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
