From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R0Bu3-0006jQ-Qh for garchives@archives.gentoo.org; Sun, 04 Sep 2011 12:34:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D46121C333; Sun, 4 Sep 2011 12:34:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 07E1A21C333 for ; Sun, 4 Sep 2011 12:34:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 638891B4025 for ; Sun, 4 Sep 2011 12:34:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BC40080042 for ; Sun, 4 Sep 2011 12:34:13 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <4cf4ce297dfb5c629f33cfa08fbd7205b23bb3a7.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 2.6.32/, 3.0.4/ X-VCS-Repository: proj/hardened-patchset X-VCS-Files: 2.6.32/0000_README 2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch 2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201109021814.patch 3.0.4/0000_README 3.0.4/4420_grsecurity-2.2.2-3.0.4-201108301903.patch 3.0.4/4420_grsecurity-2.2.2-3.0.4-201109011725.patch X-VCS-Directories: 2.6.32/ 3.0.4/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 4cf4ce297dfb5c629f33cfa08fbd7205b23bb3a7 Date: Sun, 4 Sep 2011 12:34:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: fa3a97a58b7507a78ff673c9dcc2065a commit: 4cf4ce297dfb5c629f33cfa08fbd7205b23bb3a7 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Sep 4 12:33:08 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Sep 4 12:33:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-patc= hset.git;a=3Dcommit;h=3D4cf4ce29 Grsec/PaX: grsecurity-2.2.2-2.6.32.46-201109021814 + grsecurity-2.2.2-3.0= .4-201109011725 --- 2.6.32/0000_README | 2 +- ..._grsecurity-2.2.2-2.6.32.46-201109021814.patch} | 117 ++++++++++++++= ------ 3.0.4/0000_README | 2 +- ...4420_grsecurity-2.2.2-3.0.4-201109011725.patch} | 108 +++++++++-----= ---- 4 files changed, 138 insertions(+), 91 deletions(-) diff --git a/2.6.32/0000_README b/2.6.32/0000_README index 81874c9..ca3d4a1 100644 --- a/2.6.32/0000_README +++ b/2.6.32/0000_README @@ -11,7 +11,7 @@ Patch: 1044_linux-2.6.32.45.patch From: http://www.kernel.org Desc: Linux 2.6.39.45 =20 -Patch: 4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch +Patch: 4420_grsecurity-2.2.2-2.6.32.46-201109021814.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity =20 diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch b/= 2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201109021814.patch similarity index 99% rename from 2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch rename to 2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201109021814.patch index abe67d0..505eaa4 100644 --- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch +++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201109021814.patch @@ -37669,6 +37669,30 @@ diff -urNp linux-2.6.32.46/drivers/staging/vme/d= evices/vme_user.c linux-2.6.32.4 .open =3D vme_user_open, .release =3D vme_user_release, .read =3D vme_user_read, +diff -urNp linux-2.6.32.46/drivers/staging/vt6655/hostap.c linux-2.6.32.= 46/drivers/staging/vt6655/hostap.c +--- linux-2.6.32.46/drivers/staging/vt6655/hostap.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.46/drivers/staging/vt6655/hostap.c 2011-09-02 18:13:56.= 000000000 -0400 +@@ -84,7 +84,7 @@ static int hostap_enable_hostapd(PSDevic + PSDevice apdev_priv; + struct net_device *dev =3D pDevice->dev; + int ret; +- const struct net_device_ops apdev_netdev_ops =3D { ++ static net_device_ops_no_const apdev_netdev_ops =3D { + .ndo_start_xmit =3D pDevice->tx_80211, + }; +=20 +diff -urNp linux-2.6.32.46/drivers/staging/vt6656/hostap.c linux-2.6.32.= 46/drivers/staging/vt6656/hostap.c +--- linux-2.6.32.46/drivers/staging/vt6656/hostap.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.46/drivers/staging/vt6656/hostap.c 2011-09-02 18:13:35.= 000000000 -0400 +@@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevic + PSDevice apdev_priv; + struct net_device *dev =3D pDevice->dev; + int ret; +- const struct net_device_ops apdev_netdev_ops =3D { ++ static net_device_ops_no_const apdev_netdev_ops =3D { + .ndo_start_xmit =3D pDevice->tx_80211, + }; +=20 diff -urNp linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c linux-2= .6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c --- linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c 2011-03-27 14:= 31:47.000000000 -0400 +++ linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 20:= 24:26.000000000 -0400 @@ -69459,7 +69483,7 @@ diff -urNp linux-2.6.32.46/localversion-grsec lin= ux-2.6.32.46/localversion-grsec +-grsec diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.46/Makefile --- linux-2.6.32.46/Makefile 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/Makefile 2011-08-30 18:21:35.000000000 -0400 ++++ linux-2.6.32.46/Makefile 2011-09-01 17:24:34.000000000 -0400 @@ -221,8 +221,9 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" =20 HOSTCC =3D gcc @@ -69485,7 +69509,15 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32= .46/Makefile KBUILD_AFLAGS :=3D -D__ASSEMBLY__ =20 # Read KERNELRELEASE from include/config/kernel.release (if it exists) -@@ -403,7 +406,7 @@ endif +@@ -377,6 +380,7 @@ export RCS_TAR_IGNORE :=3D --exclude SCCS=20 +=20 + # Basic helpers built in scripts/ + PHONY +=3D scripts_basic ++scripts_basic: KBUILD_CFLAGS :=3D $(filter-out $(CONSTIFY_PLUGIN) $(STA= CKLEAK_PLUGIN),$(KBUILD_CFLAGS)) + scripts_basic: + $(Q)$(MAKE) $(build)=3Dscripts/basic +=20 +@@ -403,7 +407,7 @@ endif # of make so .config is not included in this case either (for *config). =20 no-dot-config-targets :=3D clean mrproper distclean \ @@ -69494,7 +69526,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile include/linux/version.h headers_% \ kernelrelease kernelversion =20 -@@ -526,6 +529,24 @@ else +@@ -526,6 +530,24 @@ else KBUILD_CFLAGS +=3D -O2 endif =20 @@ -69504,7 +69536,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile +STACKLEAK_PLUGIN :=3D -fplugin=3D$(objtree)/tools/gcc/stackleak_plugin.= so -fplugin-arg-stackleak_plugin-track-lowest-sp=3D100 +endif +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN -+gcc-plugins: prepare ++gcc-plugins: + $(Q)$(MAKE) $(build)=3Dtools/gcc +else +gcc-plugins: @@ -69519,7 +69551,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile include $(srctree)/arch/$(SRCARCH)/Makefile =20 ifneq ($(CONFIG_FRAME_WARN),0) -@@ -644,7 +665,7 @@ export mod_strip_cmd +@@ -644,7 +666,7 @@ export mod_strip_cmd =20 =20 ifeq ($(KBUILD_EXTMOD),) @@ -69528,7 +69560,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -@@ -840,6 +861,8 @@ define rule_vmlinux-modpost +@@ -840,6 +862,8 @@ define rule_vmlinux-modpost endef =20 # vmlinux image - including updated kernel symbols @@ -69537,35 +69569,25 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.3= 2.46/Makefile vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kal= lsyms.o) FORCE ifdef CONFIG_HEADERS_CHECK $(Q)$(MAKE) -f $(srctree)/Makefile headers_check -@@ -865,7 +888,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai -=20 - # The actual objects are generated when descending,=20 - # make sure no implicit rule kicks in --$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs)= ; -+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): prepare scripts= $(vmlinux-dirs) ; -=20 - # Handle descending into subdirectories listed in $(vmlinux-dirs) - # Preset locale variables to speed up the build process. Limit locale -@@ -874,7 +897,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))=20 +@@ -874,7 +898,8 @@ $(sort $(vmlinux-init) $(vmlinux-main))=20 # Error messages still appears in the original language =20 PHONY +=3D $(vmlinux-dirs) -$(vmlinux-dirs): prepare scripts -+$(vmlinux-dirs): gcc-plugins ++$(vmlinux-dirs): KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUG= IN) ++$(vmlinux-dirs): gcc-plugins prepare scripts $(Q)$(MAKE) $(build)=3D$@ =20 # Build the kernel release string -@@ -1124,7 +1147,8 @@ all: modules - # using awk while concatenating to the final file. +@@ -983,6 +1008,7 @@ prepare0: archprepare FORCE + $(Q)$(MAKE) $(build)=3D. missing-syscalls =20 - PHONY +=3D modules --modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) -+$(vmlinux-dirs): KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUG= IN) -+modules: prepare scripts $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux= ) - $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=3D$(objtree)/%/modules.order) = > $(objtree)/modules.order - @$(kecho) ' Building modules, stage 2.'; - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1133,7 +1157,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_B + # All the preparing.. ++prepare: KBUILD_CFLAGS :=3D $(filter-out $(CONSTIFY_PLUGIN) $(STACKLEAK= _PLUGIN),$(KBUILD_CFLAGS)) + prepare: prepare0 +=20 + # The asm symlink changes when $(ARCH) changes. +@@ -1133,7 +1159,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_B =20 # Target to prepare building external modules PHONY +=3D modules_prepare @@ -69574,7 +69596,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile =20 # Target to install modules PHONY +=3D modules_install -@@ -1198,7 +1222,7 @@ MRPROPER_FILES +=3D .config .config.old in +@@ -1198,7 +1224,7 @@ MRPROPER_FILES +=3D .config .config.old in include/linux/autoconf.h include/linux/version.h = \ include/linux/utsrelease.h = \ include/linux/bounds.h include/asm*/asm-offsets.h = \ @@ -69583,7 +69605,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile =20 # clean - Delete most, but leave enough to build external modules # -@@ -1242,7 +1266,7 @@ distclean: mrproper +@@ -1242,7 +1268,7 @@ distclean: mrproper @find $(srctree) $(RCS_FIND_IGNORE) \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ @@ -69592,7 +69614,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ -type f -print | xargs rm -f =20 -@@ -1289,6 +1313,7 @@ help: +@@ -1289,6 +1315,7 @@ help: @echo ' modules_prepare - Set up for building external modules' @echo ' tags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @@ -69600,7 +69622,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile @echo ' kernelrelease - Output the release version string' @echo ' kernelversion - Output the version stored in Makefile' @echo ' headers_install - Install sanitised kernel headers to INSTAL= L_HDR_PATH'; \ -@@ -1390,6 +1415,7 @@ PHONY +=3D $(module-dirs) modules +@@ -1390,6 +1417,7 @@ PHONY +=3D $(module-dirs) modules $(module-dirs): crmodverdir $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=3D$(patsubst _module_%,%,$@) =20 @@ -69608,7 +69630,7 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.= 46/Makefile modules: $(module-dirs) @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1445,7 +1471,7 @@ endif # KBUILD_EXTMOD +@@ -1445,7 +1473,7 @@ endif # KBUILD_EXTMOD quiet_cmd_tags =3D GEN $@ cmd_tags =3D $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@ =20 @@ -69617,7 +69639,13 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32= .46/Makefile $(call cmd,tags) =20 # Scripts to check various things for consistency -@@ -1514,13 +1540,14 @@ endif +@@ -1510,17 +1538,19 @@ else + target-dir =3D $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@)) + endif +=20 +-%.s: %.c prepare scripts FORCE ++%.s: KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) ++%.s: %.c gcc-plugins prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) %.i: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) @@ -69627,13 +69655,30 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.3= 2.46/Makefile $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) %.lst: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) - %.s: %.S prepare scripts FORCE +-%.s: %.S prepare scripts FORCE ++%.s: %.S gcc-plugins prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) -%.o: %.S prepare scripts FORCE +%.o: %.S gcc-plugins prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) %.symtypes: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) +@@ -1530,11 +1560,13 @@ endif + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ + $(build)=3D$(build-dir) +-%/: prepare scripts FORCE ++%/: KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) ++%/: gcc-plugins prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ + $(build)=3D$(build-dir) +-%.ko: prepare scripts FORCE ++%.ko: KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) ++%.ko: gcc-plugins prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ + $(build)=3D$(build-dir) $(@:.ko=3D.o) diff -urNp linux-2.6.32.46/mm/backing-dev.c linux-2.6.32.46/mm/backing-d= ev.c --- linux-2.6.32.46/mm/backing-dev.c 2011-03-27 14:31:47.000000000 -0400 +++ linux-2.6.32.46/mm/backing-dev.c 2011-08-11 19:48:17.000000000 -0400 @@ -76938,10 +76983,10 @@ diff -urNp linux-2.6.32.46/scripts/basic/fixdep= .c linux-2.6.32.46/scripts/basic/ fprintf(stderr, "fixdep: sizeof(int) !=3D 4 or wrong endianess? %#x\n= ", diff -urNp linux-2.6.32.46/scripts/gcc-plugin.sh linux-2.6.32.46/scripts= /gcc-plugin.sh --- linux-2.6.32.46/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.32.46/scripts/gcc-plugin.sh 2011-08-23 20:24:19.000000000 = -0400 ++++ linux-2.6.32.46/scripts/gcc-plugin.sh 2011-08-31 18:38:41.000000000 = -0400 @@ -0,0 +1,2 @@ +#!/bin/sh -+echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$*= -print-file-name=3Dplugin`/include >/dev/null 2>&1 && echo "y" ++echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $* -x c -shared = - -o /dev/null -I`$* -print-file-name=3Dplugin`/include >/dev/null 2>&1 &= & echo "y" diff -urNp linux-2.6.32.46/scripts/Makefile.build linux-2.6.32.46/script= s/Makefile.build --- linux-2.6.32.46/scripts/Makefile.build 2011-03-27 14:31:47.000000000= -0400 +++ linux-2.6.32.46/scripts/Makefile.build 2011-08-23 20:45:11.000000000= -0400 diff --git a/3.0.4/0000_README b/3.0.4/0000_README index b6f610b..af75e4e 100644 --- a/3.0.4/0000_README +++ b/3.0.4/0000_README @@ -3,7 +3,7 @@ README =20 Individual Patch Descriptions: ------------------------------------------------------------------------= ----- -Patch: 4420_grsecurity-2.2.2-3.0.4-201108301903.patch +Patch: 4420_grsecurity-2.2.2-3.0.4-201109011725.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity =20 diff --git a/3.0.4/4420_grsecurity-2.2.2-3.0.4-201108301903.patch b/3.0.4= /4420_grsecurity-2.2.2-3.0.4-201109011725.patch similarity index 99% rename from 3.0.4/4420_grsecurity-2.2.2-3.0.4-201108301903.patch rename to 3.0.4/4420_grsecurity-2.2.2-3.0.4-201109011725.patch index 8d93a7b..1e39265 100644 --- a/3.0.4/4420_grsecurity-2.2.2-3.0.4-201108301903.patch +++ b/3.0.4/4420_grsecurity-2.2.2-3.0.4-201109011725.patch @@ -9898,17 +9898,6 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uacces= s.h linux-3.0.4/arch/x86/inclu } while (0) =20 #ifdef CONFIG_X86_WP_WORKS_OK -diff -urNp linux-3.0.4/arch/x86/include/asm/vgtod.h linux-3.0.4/arch/x86= /include/asm/vgtod.h ---- linux-3.0.4/arch/x86/include/asm/vgtod.h 2011-07-21 22:17:23.0000000= 00 -0400 -+++ linux-3.0.4/arch/x86/include/asm/vgtod.h 2011-08-23 21:47:55.0000000= 00 -0400 -@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { - int sysctl_enabled; - struct timezone sys_tz; - struct { /* extract of a clocksource struct */ -+ char name[8]; - cycle_t (*vread)(void); - cycle_t cycle_last; - cycle_t mask; diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/= x86/include/asm/x86_init.h --- linux-3.0.4/arch/x86/include/asm/x86_init.h 2011-07-21 22:17:23.0000= 00000 -0400 +++ linux-3.0.4/arch/x86/include/asm/x86_init.h 2011-08-23 21:47:55.0000= 00000 -0400 @@ -57814,16 +57803,8 @@ diff -urNp linux-3.0.4/include/net/lapb.h linux-= 3.0.4/include/net/lapb.h struct lapb_frame frmr_data; diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/n= eighbour.h --- linux-3.0.4/include/net/neighbour.h 2011-07-21 22:17:23.000000000 -0= 400 -+++ linux-3.0.4/include/net/neighbour.h 2011-08-26 19:49:56.000000000 -0= 400 -@@ -117,14 +117,14 @@ struct neighbour { - }; -=20 - struct neigh_ops { -- int family; -+ const int family; - void (*solicit)(struct neighbour *, struct sk_buff*); - void (*error_report)(struct neighbour *, struct sk_buff*); - int (*output)(struct sk_buff*); ++++ linux-3.0.4/include/net/neighbour.h 2011-08-31 18:39:25.000000000 -0= 400 +@@ -124,7 +124,7 @@ struct neigh_ops { int (*connected_output)(struct sk_buff*); int (*hh_output)(struct sk_buff*); int (*queue_xmit)(struct sk_buff*); @@ -63160,7 +63141,7 @@ diff -urNp linux-3.0.4/localversion-grsec linux-3= .0.4/localversion-grsec +-grsec diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile --- linux-3.0.4/Makefile 2011-08-29 23:26:13.000000000 -0400 -+++ linux-3.0.4/Makefile 2011-08-30 18:24:49.000000000 -0400 ++++ linux-3.0.4/Makefile 2011-09-01 17:26:49.000000000 -0400 @@ -245,8 +245,9 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" =20 HOSTCC =3D gcc @@ -63186,7 +63167,15 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Make= file KBUILD_AFLAGS_KERNEL :=3D KBUILD_CFLAGS_KERNEL :=3D KBUILD_AFLAGS :=3D -D__ASSEMBLY__ -@@ -564,6 +567,24 @@ else +@@ -408,6 +411,7 @@ export RCS_TAR_IGNORE :=3D --exclude SCCS=20 +=20 + # Basic helpers built in scripts/ + PHONY +=3D scripts_basic ++scripts_basic: KBUILD_CFLAGS :=3D $(filter-out $(CONSTIFY_PLUGIN) $(STA= CKLEAK_PLUGIN),$(KBUILD_CFLAGS)) + scripts_basic: + $(Q)$(MAKE) $(build)=3Dscripts/basic + $(Q)rm -f .tmp_quiet_recordmcount +@@ -564,6 +568,24 @@ else KBUILD_CFLAGS +=3D -O2 endif =20 @@ -63196,7 +63185,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makef= ile +STACKLEAK_PLUGIN :=3D -fplugin=3D$(objtree)/tools/gcc/stackleak_plugin.= so -fplugin-arg-stackleak_plugin-track-lowest-sp=3D100 +endif +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN -+gcc-plugins: prepare ++gcc-plugins: + $(Q)$(MAKE) $(build)=3Dtools/gcc +else +gcc-plugins: @@ -63211,7 +63200,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makef= ile include $(srctree)/arch/$(SRCARCH)/Makefile =20 ifneq ($(CONFIG_FRAME_WARN),0) -@@ -708,7 +729,7 @@ export mod_strip_cmd +@@ -708,7 +730,7 @@ export mod_strip_cmd =20 =20 ifeq ($(KBUILD_EXTMOD),) @@ -63220,7 +63209,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makef= ile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -@@ -907,6 +928,8 @@ define rule_vmlinux-modpost +@@ -907,6 +929,8 @@ define rule_vmlinux-modpost endef =20 # vmlinux image - including updated kernel symbols @@ -63229,35 +63218,25 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Mak= efile vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kal= lsyms.o) FORCE ifdef CONFIG_HEADERS_CHECK $(Q)$(MAKE) -f $(srctree)/Makefile headers_check -@@ -932,7 +955,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai -=20 - # The actual objects are generated when descending,=20 - # make sure no implicit rule kicks in --$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs)= ; -+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): prepare scripts= $(vmlinux-dirs) ; -=20 - # Handle descending into subdirectories listed in $(vmlinux-dirs) - # Preset locale variables to speed up the build process. Limit locale -@@ -941,7 +964,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))=20 +@@ -941,7 +965,8 @@ $(sort $(vmlinux-init) $(vmlinux-main))=20 # Error messages still appears in the original language =20 PHONY +=3D $(vmlinux-dirs) -$(vmlinux-dirs): prepare scripts -+$(vmlinux-dirs): gcc-plugins ++$(vmlinux-dirs): KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUG= IN) ++$(vmlinux-dirs): gcc-plugins prepare scripts $(Q)$(MAKE) $(build)=3D$@ =20 # Store (new) KERNELRELASE string in include/config/kernel.release -@@ -1087,7 +1110,8 @@ all: modules - # using awk while concatenating to the final file. +@@ -986,6 +1011,7 @@ prepare0: archprepare FORCE + $(Q)$(MAKE) $(build)=3D. missing-syscalls =20 - PHONY +=3D modules --modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builti= n -+$(vmlinux-dirs): KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUG= IN) -+modules: prepare scripts $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux= ) modules.builtin - $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=3D$(objtree)/%/modules.order) = > $(objtree)/modules.order - @$(kecho) ' Building modules, stage 2.'; - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1102,7 +1126,7 @@ modules.builtin: $(vmlinux-dirs:%=3D%/modu + # All the preparing.. ++prepare: KBUILD_CFLAGS :=3D $(filter-out $(CONSTIFY_PLUGIN) $(STACKLEAK= _PLUGIN),$(KBUILD_CFLAGS)) + prepare: prepare0 +=20 + # Generate some files +@@ -1102,7 +1128,7 @@ modules.builtin: $(vmlinux-dirs:%=3D%/modu =20 # Target to prepare building external modules PHONY +=3D modules_prepare @@ -63266,7 +63245,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makef= ile =20 # Target to install modules PHONY +=3D modules_install -@@ -1198,7 +1222,7 @@ distclean: mrproper +@@ -1198,7 +1224,7 @@ distclean: mrproper @find $(srctree) $(RCS_FIND_IGNORE) \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ @@ -63275,7 +63254,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makef= ile -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ -type f -print | xargs rm -f =20 -@@ -1359,6 +1383,7 @@ PHONY +=3D $(module-dirs) modules +@@ -1359,6 +1385,7 @@ PHONY +=3D $(module-dirs) modules $(module-dirs): crmodverdir $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=3D$(patsubst _module_%,%,$@) =20 @@ -63283,7 +63262,13 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Make= file modules: $(module-dirs) @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1489,13 +1514,14 @@ endif +@@ -1485,17 +1512,19 @@ else + target-dir =3D $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@)) + endif +=20 +-%.s: %.c prepare scripts FORCE ++%.s: KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) ++%.s: %.c gcc-plugins prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) %.i: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) @@ -63293,13 +63278,30 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Mak= efile $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) %.lst: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) - %.s: %.S prepare scripts FORCE +-%.s: %.S prepare scripts FORCE ++%.s: %.S gcc-plugins prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) -%.o: %.S prepare scripts FORCE +%.o: %.S gcc-plugins prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) %.symtypes: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=3D$(build-dir) $(target-dir)$(notdir $@) +@@ -1505,11 +1534,13 @@ endif + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ + $(build)=3D$(build-dir) +-%/: prepare scripts FORCE ++%/: KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) ++%/: gcc-plugins prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ + $(build)=3D$(build-dir) +-%.ko: prepare scripts FORCE ++%.ko: KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) ++%.ko: gcc-plugins prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=3D$(if $(CONFIG_MODULES),1) \ + $(build)=3D$(build-dir) $(@:.ko=3D.o) diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c --- linux-3.0.4/mm/filemap.c 2011-07-21 22:17:23.000000000 -0400 +++ linux-3.0.4/mm/filemap.c 2011-08-23 21:48:14.000000000 -0400 @@ -70892,10 +70894,10 @@ diff -urNp linux-3.0.4/scripts/basic/fixdep.c l= inux-3.0.4/scripts/basic/fixdep.c fprintf(stderr, "fixdep: sizeof(int) !=3D 4 or wrong endianess? %#x\n= ", diff -urNp linux-3.0.4/scripts/gcc-plugin.sh linux-3.0.4/scripts/gcc-plu= gin.sh --- linux-3.0.4/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -050= 0 -+++ linux-3.0.4/scripts/gcc-plugin.sh 2011-08-23 21:47:56.000000000 -040= 0 ++++ linux-3.0.4/scripts/gcc-plugin.sh 2011-08-31 18:39:25.000000000 -040= 0 @@ -0,0 +1,2 @@ +#!/bin/sh -+echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$*= -print-file-name=3Dplugin`/include >/dev/null 2>&1 && echo "y" ++echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $* -x c -shared = - -o /dev/null -I`$* -print-file-name=3Dplugin`/include >/dev/null 2>&1 &= & echo "y" diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefi= le.build --- linux-3.0.4/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -04= 00 +++ linux-3.0.4/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -04= 00