[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel kernel-2.6.spec, 1.1423, 1.1424 linux-2.6.11-execshield.patch, 1.11, 1.12 patch-2.6.13-rc1-git7.bz2.sign, 1.1, NONE



Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13384

Modified Files:
	kernel-2.6.spec linux-2.6.11-execshield.patch 
Removed Files:
	patch-2.6.13-rc1-git7.bz2.sign 
Log Message:
Fix exec-shield to not randomize to between end-of-binary and start-of-brk




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1423
retrieving revision 1.1424
diff -u -r1.1423 -r1.1424
--- kernel-2.6.spec	6 Jul 2005 22:28:22 -0000	1.1423
+++ kernel-2.6.spec	7 Jul 2005 19:22:46 -0000	1.1424
@@ -1250,6 +1250,9 @@
 %endif
 
 %changelog
+* Thu Jul 07 2005 Dave Jones <davej redhat com>
+- Fix exec-shield to not randomize to between end-of-binary and start-of-brk
+
 * Wed Jul 06 2005 Dave Jones <davej redhat com>
 - 2.6.13-rc2
 

linux-2.6.11-execshield.patch:
 linux-2.6.11/arch/i386/kernel/traps.c          |  111 ++++++++++++++++-------
 linux-2.6.11/arch/x86_64/mm/fault.c            |    2 
 linux-2.6.12/include/asm-x86_64/processor.h    |    5 +
 linux-2.6.12/mm/mmap.c                         |    2 
 linux-810/arch/i386/kernel/asm-offsets.c       |    1 
 linux-810/arch/i386/kernel/entry.S             |    8 +
 linux-810/arch/i386/kernel/process.c           |   59 ++++++++++++
 linux-810/arch/i386/kernel/signal.c            |    4 
 linux-810/arch/i386/kernel/smp.c               |    3 
 linux-810/arch/i386/kernel/sysenter.c          |   55 +++++++++++
 linux-810/arch/i386/kernel/traps.c             |   48 +++++++++-
 linux-810/arch/i386/kernel/vsyscall-sysenter.S |    6 -
 linux-810/arch/i386/kernel/vsyscall.lds.S      |    4 
 linux-810/arch/i386/mm/init.c                  |    6 +
 linux-810/arch/i386/mm/mmap.c                  |    6 -
 linux-810/arch/ia64/ia32/binfmt_elf32.c        |    2 
 linux-810/arch/x86_64/ia32/ia32_binfmt.c       |    2 
 linux-810/arch/x86_64/kernel/process.c         |    7 -
 linux-810/arch/x86_64/mm/Makefile              |    2 
 linux-810/arch/x86_64/mm/mmap.c                |   95 +++++++++++++++++++
 linux-810/drivers/char/random.c                |    7 +
 linux-810/fs/binfmt_elf.c                      |  120 ++++++++++++++++++++-----
 linux-810/fs/proc/array.c                      |    8 +
 linux-810/fs/proc/base.c                       |    4 
 linux-810/fs/proc/task_mmu.c                   |   25 ++++-
 linux-810/include/asm-i386/desc.h              |   14 ++
 linux-810/include/asm-i386/elf.h               |   42 +++++---
 linux-810/include/asm-i386/mmu.h               |    6 +
 linux-810/include/asm-i386/pgalloc.h           |    1 
 linux-810/include/asm-i386/processor.h         |    8 +
 linux-810/include/asm-i386/thread_info.h       |    1 
 linux-810/include/asm-ia64/pgalloc.h           |    4 
 linux-810/include/asm-ppc/pgalloc.h            |    5 +
 linux-810/include/asm-ppc64/pgalloc.h          |    5 +
 linux-810/include/asm-s390/pgalloc.h           |    4 
 linux-810/include/asm-sparc/pgalloc.h          |    4 
 linux-810/include/asm-sparc64/pgalloc.h        |    4 
 linux-810/include/asm-x86_64/pgalloc.h         |    7 +
 linux-810/include/linux/mm.h                   |    9 +
 linux-810/include/linux/resource.h             |    5 -
 linux-810/include/linux/sched.h                |    9 +
 linux-810/include/linux/sysctl.h               |    3 
 linux-810/kernel/signal.c                      |   38 +++++++
 linux-810/kernel/sysctl.c                      |   39 ++++++++
 linux-810/mm/fremap.c                          |   10 +-
 linux-810/mm/mmap.c                            |  105 ++++++++++++++++++++-
 linux-810/mm/mprotect.c                        |    5 -
 linux-810/mm/mremap.c                          |    4 
 48 files changed, 801 insertions(+), 123 deletions(-)

Index: linux-2.6.11-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6.11-execshield.patch	27 Jun 2005 05:54:04 -0000	1.11
+++ linux-2.6.11-execshield.patch	7 Jul 2005 19:22:46 -0000	1.12
@@ -1807,3 +1807,14 @@
  	if (print_fatal_signals) {
  		printk("#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, error_code/8, regs->eip, smp_processor_id());
  		printk(" exec_limit: %08lx, user_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, current->mm->context.user_cs.a, current->mm->context.user_cs.b);
+--- linux-2.6.12/mm/mmap.c~	2005-07-07 15:20:55.000000000 -0400
++++ linux-2.6.12/mm/mmap.c	2005-07-07 15:21:21.000000000 -0400
+@@ -1422,7 +1422,7 @@ unsigned long arch_get_unmapped_exec_are
+ 			 * as much as possible:
+ 			 */
+ 			if (addr >= 0x01000000) {
+-				tmp = randomize_range(0x01000000, mm->brk, len);
++				tmp = randomize_range(0x01000000, PAGE_ALIGN(max(mm->start_brk, 0x08000000)), len);
+ 				vma = find_vma(mm, tmp);
+ 				if (TASK_SIZE - len >= tmp &&
+ 				    (!vma || tmp + len <= vma->vm_start))


--- patch-2.6.13-rc1-git7.bz2.sign DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]