packages (LINUX_3_0): kernel/kernel-grsec_full.patch, kernel/kernel.spec, k...

arekm arekm at pld-linux.org
Sun Nov 13 19:25:44 CET 2011


Author: arekm                        Date: Sun Nov 13 18:25:44 2011 GMT
Module: packages                      Tag: LINUX_3_0
---- Log message:
- grsec up to grsecurity-2.2.2-3.0.9-201111121310.patch

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.85.2.1 -> 1.85.2.2) , kernel.spec (1.987.2.4 -> 1.987.2.5) 
packages/kernel/grsec/3.0:
   grsec-2.2.2-3.0.9-201111121310.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.85.2.1 packages/kernel/kernel-grsec_full.patch:1.85.2.2
--- packages/kernel/kernel-grsec_full.patch:1.85.2.1	Fri Nov 11 22:50:30 2011
+++ packages/kernel/kernel-grsec_full.patch	Sun Nov 13 19:25:35 2011
@@ -1,328 +1,6 @@
-diff -urNp linux-3.0.7/Documentation/dontdiff linux-3.0.7/Documentation/dontdiff
---- linux-3.0.7/Documentation/dontdiff	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/Documentation/dontdiff	2011-10-07 19:07:23.000000000 -0400
-@@ -5,6 +5,7 @@
- *.cis
- *.cpio
- *.csp
-+*.dbg
- *.dsp
- *.dvi
- *.elf
-@@ -48,9 +49,11 @@
- *.tab.h
- *.tex
- *.ver
-+*.vim
- *.xml
- *.xz
- *_MODULES
-+*_reg_safe.h
- *_vga16.c
- *~
- \#*#
-@@ -70,6 +73,7 @@ Kerntypes
- Module.markers
- Module.symvers
- PENDING
-+PERF*
- SCCS
- System.map*
- TAGS
-@@ -98,6 +102,8 @@ bzImage*
- capability_names.h
- capflags.c
- classlist.h*
-+clut_vga16.c
-+common-cmds.h
- comp*.log
- compile.h*
- conf
-@@ -126,12 +132,14 @@ fore200e_pca_fw.c*
- gconf
- gconf.glade.h
- gen-devlist
-+gen-kdb_cmds.c
- gen_crc32table
- gen_init_cpio
- generated
- genheaders
- genksyms
- *_gray256.c
-+hash
- hpet_example
- hugepage-mmap
- hugepage-shm
-@@ -146,7 +154,6 @@ int32.c
- int4.c
- int8.c
- kallsyms
--kconfig
- keywords.c
- ksym.c*
- ksym.h*
-@@ -154,7 +161,6 @@ kxgettext
- lkc_defs.h
- lex.c
- lex.*.c
--linux
- logo_*.c
- logo_*_clut224.c
- logo_*_mono.c
-@@ -166,7 +172,6 @@ machtypes.h
- map
- map_hugetlb
- maui_boot.h
--media
- mconf
- miboot*
- mk_elfconfig
-@@ -174,6 +179,7 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
- mkregtable
- mktables
-@@ -209,6 +215,7 @@ r300_reg_safe.h
- r420_reg_safe.h
- r600_reg_safe.h
- recordmcount
-+regdb.c
- relocs
- rlim_names.h
- rn50_reg_safe.h
-@@ -219,6 +226,7 @@ setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -246,7 +254,9 @@ vmlinux
- vmlinux-*
- vmlinux.aout
- vmlinux.bin.all
-+vmlinux.bin.bz2
- vmlinux.lds
-+vmlinux.relocs
- vmlinuz
- voffset.h
- vsyscall.lds
-@@ -254,6 +264,7 @@ vsyscall_32.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- wakeup.bin
- wakeup.elf
- wakeup.lds
-diff -urNp linux-3.0.7/Documentation/kernel-parameters.txt linux-3.0.7/Documentation/kernel-parameters.txt
---- linux-3.0.7/Documentation/kernel-parameters.txt	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/Documentation/kernel-parameters.txt	2011-08-23 21:47:55.000000000 -0400
-@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
- 			the specified number of seconds.  This is to be used if
- 			your oopses keep scrolling off the screen.
- 
-+	pax_nouderef	[X86] disables UDEREF.  Most likely needed under certain
-+			virtualization environments that don't cope well with the
-+			expand down segment used by UDEREF on X86-32 or the frequent
-+			page table updates on X86-64.
-+
-+	pax_softmode=	0/1 to disable/enable PaX softmode on boot already.
-+
- 	pcbit=		[HW,ISDN]
- 
- 	pcd.		[PARIDE]
-diff -urNp linux-3.0.7/Makefile linux-3.0.7/Makefile
---- linux-3.0.7/Makefile	2011-10-17 23:17:08.000000000 -0400
-+++ linux-3.0.7/Makefile	2011-10-17 23:17:19.000000000 -0400
-@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
- 
- HOSTCC       = gcc
- HOSTCXX      = g++
--HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS   = -Wall -W -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)
-+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
- 
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -365,10 +366,12 @@ LINUXINCLUDE    := -I$(srctree)/arch/$(h
- KBUILD_CPPFLAGS := -D__KERNEL__
- 
- KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-+		   -W -Wno-unused-parameter -Wno-missing-field-initializers \
- 		   -fno-strict-aliasing -fno-common \
- 		   -Werror-implicit-function-declaration \
- 		   -Wno-format-security \
- 		   -fno-delete-null-pointer-checks
-+KBUILD_CFLAGS   += $(call cc-option, -Wno-empty-body)
- KBUILD_AFLAGS_KERNEL :=
- KBUILD_CFLAGS_KERNEL :=
- KBUILD_AFLAGS   := -D__ASSEMBLY__
-@@ -407,8 +410,8 @@ export RCS_TAR_IGNORE := --exclude SCCS 
- # Rules shared between *config targets and build targets
- 
- # Basic helpers built in scripts/
--PHONY += scripts_basic
--scripts_basic:
-+PHONY += scripts_basic gcc-plugins
-+scripts_basic: gcc-plugins
- 	$(Q)$(MAKE) $(build)=scripts/basic
- 	$(Q)rm -f .tmp_quiet_recordmcount
- 
-@@ -564,6 +567,36 @@ else
- KBUILD_CFLAGS	+= -O2
- endif
- 
-+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
-+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
-+ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
-+endif
-+ifdef CONFIG_KALLOCSTAT_PLUGIN
-+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
-+endif
-+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
-+endif
-+ifdef CONFIG_CHECKER_PLUGIN
-+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
-+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
-+endif
-+endif
-+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
-+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
-+gcc-plugins:
-+	$(Q)$(MAKE) $(build)=tools/gcc
-+else
-+gcc-plugins:
-+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
-+	$(error Your gcc installation does not support plugins.  If the necessary headers for plugin support are missing, they should be installed.  On Debian, apt-get install gcc-<ver>-plugin-dev.))
-+else
-+	$(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
-+endif
-+	$(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure"
-+endif
-+
- include $(srctree)/arch/$(SRCARCH)/Makefile
- 
- ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -708,7 +741,7 @@ export mod_strip_cmd
- 
- 
- ifeq ($(KBUILD_EXTMOD),)
--core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- 
- vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -932,6 +965,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
- 
- # The actual objects are generated when descending, 
- # make sure no implicit rule kicks in
-+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
- $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
- 
- # Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -941,7 +975,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
- # Error messages still appears in the original language
- 
- PHONY += $(vmlinux-dirs)
--$(vmlinux-dirs): prepare scripts
-+$(vmlinux-dirs): gcc-plugins prepare scripts
- 	$(Q)$(MAKE) $(build)=$@
- 
- # Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -986,6 +1020,7 @@ prepare0: archprepare FORCE
- 	$(Q)$(MAKE) $(build)=. missing-syscalls
- 
- # All the preparing..
-+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
- prepare: prepare0
- 
- # Generate some files
-@@ -1087,6 +1122,7 @@ all: modules
- #	using awk while concatenating to the final file.
- 
- PHONY += modules
-+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
- 	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
- 	@$(kecho) '  Building modules, stage 2.';
-@@ -1102,7 +1138,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
- 
- # Target to prepare building external modules
- PHONY += modules_prepare
--modules_prepare: prepare scripts
-+modules_prepare: gcc-plugins prepare scripts
- 
- # Target to install modules
- PHONY += modules_install
-@@ -1198,7 +1234,7 @@ distclean: mrproper
- 	@find $(srctree) $(RCS_FIND_IGNORE) \
- 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
- 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
--		-o -name '.*.rej' -o -size 0 \
-+		-o -name '.*.rej' -o -name '*.so' -o -size 0 \
- 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
- 		-type f -print | xargs rm -f
- 
-@@ -1359,6 +1395,7 @@ PHONY += $(module-dirs) modules
- $(module-dirs): crmodverdir $(objtree)/Module.symvers
- 	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
- 
-+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
- modules: $(module-dirs)
- 	@$(kecho) '  Building modules, stage 2.';
- 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1485,17 +1522,19 @@ else
-         target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
- endif
- 
--%.s: %.c prepare scripts FORCE
-+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.s: %.c gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.i: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.o: %.c prepare scripts FORCE
-+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.o: %.c gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.lst: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.s: %.S prepare scripts FORCE
-+%.s: %.S gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.o: %.S prepare scripts FORCE
-+%.o: %.S gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.symtypes: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1505,11 +1544,13 @@ endif
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
--%/: prepare scripts FORCE
-+%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%/: gcc-plugins prepare scripts FORCE
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
--%.ko: prepare scripts FORCE
-+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.ko: gcc-plugins prepare scripts FORCE
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
- 	$(build)=$(build-dir) $(@:.ko=.o)
-diff -urNp linux-3.0.7/arch/alpha/include/asm/elf.h linux-3.0.7/arch/alpha/include/asm/elf.h
---- linux-3.0.7/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/alpha/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/alpha/include/asm/elf.h linux-3.0.9/arch/alpha/include/asm/elf.h
+--- linux-3.0.9/arch/alpha/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/alpha/include/asm/elf.h	2011-11-12 12:47:13.000000000 -0500
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -337,9 +15,9 @@
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-3.0.7/arch/alpha/include/asm/pgtable.h linux-3.0.7/arch/alpha/include/asm/pgtable.h
---- linux-3.0.7/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/alpha/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/alpha/include/asm/pgtable.h linux-3.0.9/arch/alpha/include/asm/pgtable.h
+--- linux-3.0.9/arch/alpha/include/asm/pgtable.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/alpha/include/asm/pgtable.h	2011-11-12 12:47:13.000000000 -0500
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -358,9 +36,9 @@
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-3.0.7/arch/alpha/kernel/module.c linux-3.0.7/arch/alpha/kernel/module.c
---- linux-3.0.7/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/alpha/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/alpha/kernel/module.c linux-3.0.9/arch/alpha/kernel/module.c
+--- linux-3.0.9/arch/alpha/kernel/module.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/alpha/kernel/module.c	2011-11-12 12:47:13.000000000 -0500
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -370,9 +48,9 @@
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.7/arch/alpha/kernel/osf_sys.c linux-3.0.7/arch/alpha/kernel/osf_sys.c
---- linux-3.0.7/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/alpha/kernel/osf_sys.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel/osf_sys.c
+--- linux-3.0.9/arch/alpha/kernel/osf_sys.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/alpha/kernel/osf_sys.c	2011-11-12 12:47:13.000000000 -0500
 @@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
@@ -404,9 +82,9 @@
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-3.0.7/arch/alpha/mm/fault.c linux-3.0.7/arch/alpha/mm/fault.c
---- linux-3.0.7/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/alpha/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/arch/alpha/mm/fault.c
+--- linux-3.0.9/arch/alpha/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/alpha/mm/fault.c	2011-11-12 12:47:13.000000000 -0500
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -563,9 +241,9 @@
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-3.0.7/arch/arm/include/asm/elf.h linux-3.0.7/arch/arm/include/asm/elf.h
---- linux-3.0.7/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/include/asm/elf.h linux-3.0.9/arch/arm/include/asm/elf.h
+--- linux-3.0.9/arch/arm/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/include/asm/elf.h	2011-11-12 12:47:13.000000000 -0500
 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -593,9 +271,9 @@
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-3.0.7/arch/arm/include/asm/kmap_types.h linux-3.0.7/arch/arm/include/asm/kmap_types.h
---- linux-3.0.7/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/include/asm/kmap_types.h linux-3.0.9/arch/arm/include/asm/kmap_types.h
+--- linux-3.0.9/arch/arm/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/include/asm/kmap_types.h	2011-11-12 12:47:13.000000000 -0500
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -604,9 +282,9 @@
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.7/arch/arm/include/asm/uaccess.h linux-3.0.7/arch/arm/include/asm/uaccess.h
---- linux-3.0.7/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/include/asm/uaccess.h linux-3.0.9/arch/arm/include/asm/uaccess.h
+--- linux-3.0.9/arch/arm/include/asm/uaccess.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/include/asm/uaccess.h	2011-11-12 12:47:13.000000000 -0500
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -662,9 +340,9 @@
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-3.0.7/arch/arm/kernel/armksyms.c linux-3.0.7/arch/arm/kernel/armksyms.c
---- linux-3.0.7/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/kernel/armksyms.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/kernel/armksyms.c linux-3.0.9/arch/arm/kernel/armksyms.c
+--- linux-3.0.9/arch/arm/kernel/armksyms.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/kernel/armksyms.c	2011-11-12 12:47:13.000000000 -0500
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -676,9 +354,9 @@
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.7/arch/arm/kernel/process.c linux-3.0.7/arch/arm/kernel/process.c
---- linux-3.0.7/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9/arch/arm/kernel/process.c
+--- linux-3.0.9/arch/arm/kernel/process.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/kernel/process.c	2011-11-12 12:47:13.000000000 -0500
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
@@ -700,9 +378,9 @@
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.7/arch/arm/kernel/traps.c linux-3.0.7/arch/arm/kernel/traps.c
---- linux-3.0.7/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9/arch/arm/kernel/traps.c
+--- linux-3.0.9/arch/arm/kernel/traps.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/kernel/traps.c	2011-11-12 12:47:13.000000000 -0500
 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -722,9 +400,9 @@
  	if (ret != NOTIFY_STOP)
  		do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.7/arch/arm/lib/copy_from_user.S linux-3.0.7/arch/arm/lib/copy_from_user.S
---- linux-3.0.7/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/lib/copy_from_user.S linux-3.0.9/arch/arm/lib/copy_from_user.S
+--- linux-3.0.9/arch/arm/lib/copy_from_user.S	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/copy_from_user.S	2011-11-12 12:47:13.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -748,9 +426,9 @@
  
  	.pushsection .fixup,"ax"
  	.align 0
-diff -urNp linux-3.0.7/arch/arm/lib/copy_to_user.S linux-3.0.7/arch/arm/lib/copy_to_user.S
---- linux-3.0.7/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/lib/copy_to_user.S linux-3.0.9/arch/arm/lib/copy_to_user.S
+--- linux-3.0.9/arch/arm/lib/copy_to_user.S	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/copy_to_user.S	2011-11-12 12:47:13.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -774,9 +452,9 @@
  ENDPROC(__copy_to_user_std)
  
  	.pushsection .fixup,"ax"
-diff -urNp linux-3.0.7/arch/arm/lib/uaccess.S linux-3.0.7/arch/arm/lib/uaccess.S
---- linux-3.0.7/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/lib/uaccess.S linux-3.0.9/arch/arm/lib/uaccess.S
+--- linux-3.0.9/arch/arm/lib/uaccess.S	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/uaccess.S	2011-11-12 12:47:13.000000000 -0500
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -830,9 +508,9 @@
  
  		.pushsection .fixup,"ax"
  		.align	0
-diff -urNp linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c	2011-11-12 12:47:13.000000000 -0500
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -842,9 +520,9 @@
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c	2011-11-12 12:47:13.000000000 -0500
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -854,9 +532,9 @@
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.7/arch/arm/mm/fault.c linux-3.0.7/arch/arm/mm/fault.c
---- linux-3.0.7/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c
+--- linux-3.0.9/arch/arm/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/mm/fault.c	2011-11-12 12:47:13.000000000 -0500
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -905,9 +583,9 @@
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.7/arch/arm/mm/mmap.c linux-3.0.7/arch/arm/mm/mmap.c
---- linux-3.0.7/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/arm/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/arm/mm/mmap.c linux-3.0.9/arch/arm/mm/mmap.c
+--- linux-3.0.9/arch/arm/mm/mmap.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/arm/mm/mmap.c	2011-11-12 12:47:13.000000000 -0500
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -957,9 +635,9 @@
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-3.0.7/arch/avr32/include/asm/elf.h linux-3.0.7/arch/avr32/include/asm/elf.h
---- linux-3.0.7/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/avr32/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/avr32/include/asm/elf.h linux-3.0.9/arch/avr32/include/asm/elf.h
+--- linux-3.0.9/arch/avr32/include/asm/elf.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/avr32/include/asm/elf.h	2011-11-12 12:47:13.000000000 -0500
 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -976,9 +654,9 @@
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-3.0.7/arch/avr32/include/asm/kmap_types.h linux-3.0.7/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.7/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/avr32/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/avr32/include/asm/kmap_types.h linux-3.0.9/arch/avr32/include/asm/kmap_types.h
+--- linux-3.0.9/arch/avr32/include/asm/kmap_types.h	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/avr32/include/asm/kmap_types.h	2011-11-12 12:47:13.000000000 -0500
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -989,9 +667,9 @@
  };
  
  #undef D
-diff -urNp linux-3.0.7/arch/avr32/mm/fault.c linux-3.0.7/arch/avr32/mm/fault.c
---- linux-3.0.7/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.7/arch/avr32/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.9/arch/avr32/mm/fault.c linux-3.0.9/arch/avr32/mm/fault.c
+--- linux-3.0.9/arch/avr32/mm/fault.c	2011-11-11 13:12:24.000000000 -0500
++++ linux-3.0.9/arch/avr32/mm/fault.c	2011-11-12 12:47:13.000000000 -0500
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.85.2.1&r2=1.85.2.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.4&r2=1.987.2.5&f=u



More information about the pld-cvs-commit mailing list