diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-07-25 11:59:28 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-07-25 11:59:28 -0400 |
| commit | b63339259412f200d444f462fe957ad2181a7833 (patch) | |
| tree | 4ec8d7d7b45f69ebe983736c1d632ae5e2ed9198 | |
| parent | Grsec/PaX: 3.0-{3.2.60,3.14.13,3.15.6}-201407232200 (diff) | |
| download | hardened-patchset-b63339259412f200d444f462fe957ad2181a7833.tar.gz hardened-patchset-b63339259412f200d444f462fe957ad2181a7833.tar.bz2 hardened-patchset-b63339259412f200d444f462fe957ad2181a7833.zip | |
Refresh line numbers20140723
| -rw-r--r-- | 3.14.13/4427_force_XATTR_PAX_tmpfs.patch | 4 | ||||
| -rw-r--r-- | 3.14.13/4475_emutramp_default_on.patch | 2 | ||||
| -rw-r--r-- | 3.15.6/4427_force_XATTR_PAX_tmpfs.patch | 4 | ||||
| -rw-r--r-- | 3.15.6/4435_grsec-mute-warnings.patch | 7 |
4 files changed, 8 insertions, 9 deletions
diff --git a/3.14.13/4427_force_XATTR_PAX_tmpfs.patch b/3.14.13/4427_force_XATTR_PAX_tmpfs.patch index 3db2112..11a7d2c 100644 --- a/3.14.13/4427_force_XATTR_PAX_tmpfs.patch +++ b/3.14.13/4427_force_XATTR_PAX_tmpfs.patch @@ -6,7 +6,7 @@ namespace supported on tmpfs so that the PaX markings survive emerge. diff -Naur a/mm/shmem.c b/mm/shmem.c --- a/mm/shmem.c 2013-06-11 21:00:18.000000000 -0400 +++ b/mm/shmem.c 2013-06-11 21:08:18.000000000 -0400 -@@ -2265,11 +2265,7 @@ +@@ -2298,11 +2298,7 @@ static int shmem_xattr_validate(const char *name) { struct { const char *prefix; size_t len; } arr[] = { @@ -18,7 +18,7 @@ diff -Naur a/mm/shmem.c b/mm/shmem.c { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN }, { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN } }; -@@ -2325,14 +2321,12 @@ +@@ -2358,14 +2354,12 @@ if (err) return err; diff --git a/3.14.13/4475_emutramp_default_on.patch b/3.14.13/4475_emutramp_default_on.patch index 015c7c1..cf88fd9 100644 --- a/3.14.13/4475_emutramp_default_on.patch +++ b/3.14.13/4475_emutramp_default_on.patch @@ -19,7 +19,7 @@ diff -Naur linux-3.9.2-hardened.orig/security/Kconfig linux-3.9.2-hardened/secur depends on (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86) help There are some programs and libraries that for one reason or -@@ -450,6 +450,12 @@ +@@ -451,6 +451,12 @@ utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC for the affected files. diff --git a/3.15.6/4427_force_XATTR_PAX_tmpfs.patch b/3.15.6/4427_force_XATTR_PAX_tmpfs.patch index 85766c5..bbcef41 100644 --- a/3.15.6/4427_force_XATTR_PAX_tmpfs.patch +++ b/3.15.6/4427_force_XATTR_PAX_tmpfs.patch @@ -6,7 +6,7 @@ namespace supported on tmpfs so that the PaX markings survive emerge. diff -Naur a/mm/shmem.c b/mm/shmem.c --- a/mm/shmem.c 2013-06-11 21:00:18.000000000 -0400 +++ b/mm/shmem.c 2013-06-11 21:08:18.000000000 -0400 -@@ -2182,11 +2182,7 @@ +@@ -2218,11 +2218,7 @@ static int shmem_xattr_validate(const char *name) { struct { const char *prefix; size_t len; } arr[] = { @@ -18,7 +18,7 @@ diff -Naur a/mm/shmem.c b/mm/shmem.c { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN }, { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN } }; -@@ -2242,14 +2238,12 @@ +@@ -2278,14 +2274,12 @@ if (err) return err; diff --git a/3.15.6/4435_grsec-mute-warnings.patch b/3.15.6/4435_grsec-mute-warnings.patch index a685858..41d43d5 100644 --- a/3.15.6/4435_grsec-mute-warnings.patch +++ b/3.15.6/4435_grsec-mute-warnings.patch @@ -29,13 +29,12 @@ warning flags of vanilla kernel versions. Acked-by: Christian Heim <phreak@gentoo.org> --- ---- a/Makefile 2011-11-18 17:50:11.000000000 -0500 -+++ b/Makefile 2011-11-18 17:50:48.000000000 -0500 -@@ -245,8 +245,7 @@ +--- a/Makefile 2014-07-25 11:37:45.206051736 -0400 ++++ b/Makefile 2014-07-25 11:38:13.786050367 -0400 +@@ -245,7 +245,7 @@ HOSTCC = gcc HOSTCXX = g++ --HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks +HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks HOSTCFLAGS += $(call cc-option, -Wno-empty-body) |