| 1 |
commit: 9fac4bbd5e39be69be7f3bcfcb18035766cbc1d2 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 02:40:11 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 02:40:11 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=9fac4bbd |
| 7 |
|
| 8 |
Grsec/PaX: 2.2.2-2.6.32.45-201108281458 + 2.2.2-3.0.3-201108281458 |
| 9 |
|
| 10 |
--- |
| 11 |
2.6.32/0000_README | 2 +- |
| 12 |
..._grsecurity-2.2.2-2.6.32.45-201108281458.patch} | 5 ++- |
| 13 |
3.0.3/0000_README | 2 +- |
| 14 |
...4420_grsecurity-2.2.2-3.0.3-201108281458.patch} | 24 ++++++++++--------- |
| 15 |
4 files changed, 18 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/2.6.32/0000_README b/2.6.32/0000_README |
| 18 |
index f6d9728..61d9a15 100644 |
| 19 |
--- a/2.6.32/0000_README |
| 20 |
+++ b/2.6.32/0000_README |
| 21 |
@@ -11,7 +11,7 @@ Patch: 1044_linux-2.6.32.45.patch |
| 22 |
From: http://www.kernel.org |
| 23 |
Desc: Linux 2.6.39.45 |
| 24 |
|
| 25 |
-Patch: 4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch |
| 26 |
+Patch: 4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch |
| 27 |
From: http://www.grsecurity.net |
| 28 |
Desc: hardened-sources base patch from upstream grsecurity |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch |
| 32 |
similarity index 99% |
| 33 |
rename from 2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch |
| 34 |
rename to 2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch |
| 35 |
index 0ce666e..1c7de41 100644 |
| 36 |
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch |
| 37 |
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch |
| 38 |
@@ -76080,8 +76080,8 @@ diff -urNp linux-2.6.32.45/sound/usb/usbaudio.c linux-2.6.32.45/sound/usb/usbaud |
| 39 |
} |
| 40 |
diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc/constify_plugin.c |
| 41 |
--- linux-2.6.32.45/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 |
| 42 |
-+++ linux-2.6.32.45/tools/gcc/constify_plugin.c 2011-08-26 20:19:09.000000000 -0400 |
| 43 |
-@@ -0,0 +1,288 @@ |
| 44 |
++++ linux-2.6.32.45/tools/gcc/constify_plugin.c 2011-08-27 07:42:35.000000000 -0400 |
| 45 |
+@@ -0,0 +1,289 @@ |
| 46 |
+/* |
| 47 |
+ * Copyright 2011 by Emese Revfy <re.emese@×××××.com> |
| 48 |
+ * Licensed under the GPL v2, or (at your option) v3 |
| 49 |
@@ -76106,6 +76106,7 @@ diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc |
| 50 |
+#include "function.h" |
| 51 |
+#include "tree-flow.h" |
| 52 |
+#include "plugin.h" |
| 53 |
++#include "diagnostic-core.h" |
| 54 |
+//#include "c-tree.h" |
| 55 |
+ |
| 56 |
+#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE) |
| 57 |
|
| 58 |
diff --git a/3.0.3/0000_README b/3.0.3/0000_README |
| 59 |
index b64e0c1..9b93d16 100644 |
| 60 |
--- a/3.0.3/0000_README |
| 61 |
+++ b/3.0.3/0000_README |
| 62 |
@@ -3,7 +3,7 @@ README |
| 63 |
|
| 64 |
Individual Patch Descriptions: |
| 65 |
----------------------------------------------------------------------------- |
| 66 |
-Patch: 4420_grsecurity-2.2.2-3.0.3-201108262310.patch |
| 67 |
+Patch: 4420_grsecurity-2.2.2-3.0.3-201108281458.patch |
| 68 |
From: http://www.grsecurity.net |
| 69 |
Desc: hardened-sources base patch from upstream grsecurity |
| 70 |
|
| 71 |
|
| 72 |
diff --git a/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108262310.patch b/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch |
| 73 |
similarity index 99% |
| 74 |
rename from 3.0.3/4420_grsecurity-2.2.2-3.0.3-201108262310.patch |
| 75 |
rename to 3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch |
| 76 |
index 857914a..ea39dff 100644 |
| 77 |
--- a/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108262310.patch |
| 78 |
+++ b/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch |
| 79 |
@@ -60436,7 +60436,7 @@ diff -urNp linux-3.0.3/localversion-grsec linux-3.0.3/localversion-grsec |
| 80 |
+-grsec |
| 81 |
diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 82 |
--- linux-3.0.3/Makefile 2011-08-23 21:44:40.000000000 -0400 |
| 83 |
-+++ linux-3.0.3/Makefile 2011-08-26 22:52:37.000000000 -0400 |
| 84 |
++++ linux-3.0.3/Makefile 2011-08-27 21:15:31.000000000 -0400 |
| 85 |
@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" |
| 86 |
|
| 87 |
HOSTCC = gcc |
| 88 |
@@ -60462,7 +60462,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 89 |
KBUILD_AFLAGS_KERNEL := |
| 90 |
KBUILD_CFLAGS_KERNEL := |
| 91 |
KBUILD_AFLAGS := -D__ASSEMBLY__ |
| 92 |
-@@ -564,6 +567,24 @@ else |
| 93 |
+@@ -564,6 +567,25 @@ else |
| 94 |
KBUILD_CFLAGS += -O2 |
| 95 |
endif |
| 96 |
|
| 97 |
@@ -60472,8 +60472,9 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 98 |
+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100 |
| 99 |
+endif |
| 100 |
+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN |
| 101 |
-+gcc-plugins: |
| 102 |
++gcc-plugins0: |
| 103 |
+ $(Q)$(MAKE) $(build)=tools/gcc |
| 104 |
++gcc-plugins: scripts_basic gcc-plugins0 |
| 105 |
+else |
| 106 |
+gcc-plugins: |
| 107 |
+ifeq ($(call cc-ifversion, -ge, 0405, y), y) |
| 108 |
@@ -60487,7 +60488,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 109 |
include $(srctree)/arch/$(SRCARCH)/Makefile |
| 110 |
|
| 111 |
ifneq ($(CONFIG_FRAME_WARN),0) |
| 112 |
-@@ -708,7 +729,7 @@ export mod_strip_cmd |
| 113 |
+@@ -708,7 +730,7 @@ export mod_strip_cmd |
| 114 |
|
| 115 |
|
| 116 |
ifeq ($(KBUILD_EXTMOD),) |
| 117 |
@@ -60496,7 +60497,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 118 |
|
| 119 |
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
| 120 |
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |
| 121 |
-@@ -907,6 +928,7 @@ define rule_vmlinux-modpost |
| 122 |
+@@ -907,6 +929,7 @@ define rule_vmlinux-modpost |
| 123 |
endef |
| 124 |
|
| 125 |
# vmlinux image - including updated kernel symbols |
| 126 |
@@ -60504,7 +60505,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 127 |
vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE |
| 128 |
ifdef CONFIG_HEADERS_CHECK |
| 129 |
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check |
| 130 |
-@@ -973,7 +995,7 @@ ifneq ($(KBUILD_SRC),) |
| 131 |
+@@ -973,7 +996,7 @@ ifneq ($(KBUILD_SRC),) |
| 132 |
endif |
| 133 |
|
| 134 |
# prepare2 creates a makefile if using a separate output directory |
| 135 |
@@ -60513,7 +60514,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 136 |
|
| 137 |
prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ |
| 138 |
include/config/auto.conf |
| 139 |
-@@ -1087,6 +1109,7 @@ all: modules |
| 140 |
+@@ -1087,6 +1110,7 @@ all: modules |
| 141 |
# using awk while concatenating to the final file. |
| 142 |
|
| 143 |
PHONY += modules |
| 144 |
@@ -60521,7 +60522,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 145 |
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin |
| 146 |
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order |
| 147 |
@$(kecho) ' Building modules, stage 2.'; |
| 148 |
-@@ -1359,6 +1382,7 @@ PHONY += $(module-dirs) modules |
| 149 |
+@@ -1359,6 +1383,7 @@ PHONY += $(module-dirs) modules |
| 150 |
$(module-dirs): crmodverdir $(objtree)/Module.symvers |
| 151 |
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) |
| 152 |
|
| 153 |
@@ -60529,7 +60530,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile |
| 154 |
modules: $(module-dirs) |
| 155 |
@$(kecho) ' Building modules, stage 2.'; |
| 156 |
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
| 157 |
-@@ -1404,7 +1428,7 @@ clean: $(clean-dirs) |
| 158 |
+@@ -1404,7 +1429,7 @@ clean: $(clean-dirs) |
| 159 |
$(call cmd,rmdirs) |
| 160 |
$(call cmd,rmfiles) |
| 161 |
@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ |
| 162 |
@@ -69628,8 +69629,8 @@ diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h |
| 163 |
struct snd_usb_stream { |
| 164 |
diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constify_plugin.c |
| 165 |
--- linux-3.0.3/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 |
| 166 |
-+++ linux-3.0.3/tools/gcc/constify_plugin.c 2011-08-26 19:49:56.000000000 -0400 |
| 167 |
-@@ -0,0 +1,288 @@ |
| 168 |
++++ linux-3.0.3/tools/gcc/constify_plugin.c 2011-08-27 07:43:46.000000000 -0400 |
| 169 |
+@@ -0,0 +1,289 @@ |
| 170 |
+/* |
| 171 |
+ * Copyright 2011 by Emese Revfy <re.emese@×××××.com> |
| 172 |
+ * Licensed under the GPL v2, or (at your option) v3 |
| 173 |
@@ -69654,6 +69655,7 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif |
| 174 |
+#include "function.h" |
| 175 |
+#include "tree-flow.h" |
| 176 |
+#include "plugin.h" |
| 177 |
++#include "diagnostic-core.h" |
| 178 |
+//#include "c-tree.h" |
| 179 |
+ |
| 180 |
+#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE) |
Archives