diff options
author | Anthony G. Basile <basile@opensource.dyc.edu> | 2011-01-29 10:23:04 -0500 |
---|---|---|
committer | Anthony G. Basile <basile@opensource.dyc.edu> | 2011-01-29 10:23:04 -0500 |
commit | 1a7e09fbbe748411898d384a56f269579782ebab (patch) | |
tree | 77bbe77f0949a30c158c445f58b9dbffa841a555 | |
parent | Update Grsec/PaX (diff) | |
download | hardened-patchset-1a7e09fbbe748411898d384a56f269579782ebab.tar.gz hardened-patchset-1a7e09fbbe748411898d384a56f269579782ebab.tar.bz2 hardened-patchset-1a7e09fbbe748411898d384a56f269579782ebab.zip |
Update Grsec/PaX20110127
2.2.1-2.6.32.28-201101272313
2.2.1-2.6.37-201101272240
-rw-r--r-- | 2.6.32/0000_README | 2 | ||||
-rw-r--r-- | 2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201101272313.patch (renamed from 2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201101252237.patch) | 35 | ||||
-rw-r--r-- | 2.6.37/0000_README | 2 | ||||
-rw-r--r-- | 2.6.37/4420_grsecurity-2.2.1-2.6.37-201101272240.patch (renamed from 2.6.37/4420_grsecurity-2.2.1-2.6.37-201101252237.patch) | 6 |
4 files changed, 37 insertions, 8 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README index fc19bc6..d19cb36 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.28-201101252237.patch +Patch: 4420_grsecurity-2.2.1-2.6.32.28-201101272313.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.28-201101252237.patch b/2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201101272313.patch index 7797cef..578be36 100644 --- a/2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201101252237.patch +++ b/2.6.32/4420_grsecurity-2.2.1-2.6.32.28-201101272313.patch @@ -7722,9 +7722,38 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/i387.h linux-2.6.32.28/arch/x86/ /* * These must be called with preempt disabled +diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_32.h linux-2.6.32.28/arch/x86/include/asm/io_32.h +--- linux-2.6.32.28/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.28/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500 +@@ -3,6 +3,7 @@ + + #include <linux/string.h> + #include <linux/compiler.h> ++#include <asm/processor.h> + + /* + * This file contains the definitions for the x86 IO instructions +@@ -42,6 +43,17 @@ + + #ifdef __KERNEL__ + ++#define ARCH_HAS_VALID_PHYS_ADDR_RANGE ++static inline int valid_phys_addr_range(unsigned long addr, size_t count) ++{ ++ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++} ++ ++static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count) ++{ ++ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++} ++ + #include <asm-generic/iomap.h> + + #include <linux/vmalloc.h> diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_64.h linux-2.6.32.28/arch/x86/include/asm/io_64.h --- linux-2.6.32.28/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.28/arch/x86/include/asm/io_64.h 2010-12-31 14:46:53.000000000 -0500 ++++ linux-2.6.32.28/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -7732,12 +7761,12 @@ diff -urNp linux-2.6.32.28/arch/x86/include/asm/io_64.h linux-2.6.32.28/arch/x86 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE +static inline int valid_phys_addr_range(unsigned long addr, size_t count) +{ -+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count) +{ -+ return (pfn + (count >> PAGE_SHIFT)) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + #include <asm-generic/iomap.h> diff --git a/2.6.37/0000_README b/2.6.37/0000_README index 6bc9c6e..2c6b512 100644 --- a/2.6.37/0000_README +++ b/2.6.37/0000_README @@ -3,7 +3,7 @@ README Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 4420_grsecurity-2.2.1-2.6.37-201101252237.patch +Patch 4420_grsecurity-2.2.1-2.6.37-201101272240.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/2.6.37/4420_grsecurity-2.2.1-2.6.37-201101252237.patch b/2.6.37/4420_grsecurity-2.2.1-2.6.37-201101272240.patch index a709d1d..053126a 100644 --- a/2.6.37/4420_grsecurity-2.2.1-2.6.37-201101252237.patch +++ b/2.6.37/4420_grsecurity-2.2.1-2.6.37-201101272240.patch @@ -7759,7 +7759,7 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/i387.h linux-2.6.37/arch/x86/includ * These must be called with preempt disabled diff -urNp linux-2.6.37/arch/x86/include/asm/io.h linux-2.6.37/arch/x86/include/asm/io.h --- linux-2.6.37/arch/x86/include/asm/io.h 2011-01-04 19:50:19.000000000 -0500 -+++ linux-2.6.37/arch/x86/include/asm/io.h 2011-01-17 02:41:00.000000000 -0500 ++++ linux-2.6.37/arch/x86/include/asm/io.h 2011-01-27 22:37:21.000000000 -0500 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void); #include <linux/vmalloc.h> @@ -7767,12 +7767,12 @@ diff -urNp linux-2.6.37/arch/x86/include/asm/io.h linux-2.6.37/arch/x86/include/ +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE +static inline int valid_phys_addr_range(unsigned long addr, size_t count) +{ -+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count) +{ -+ return (pfn + (count >> PAGE_SHIFT)) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + /* |