rpms/kernel/devel linux-2.6-execshield-fixes.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	linux-2.6-execshield-fixes.patch 
Log Message:
fix x86-64


linux-2.6-execshield-fixes.patch:
 arch/i386/kernel/traps.c       |    2 +-
 arch/x86_64/ia32/ia32_binfmt.c |    2 +-
 fs/proc/base.c                 |    2 +-
 include/asm-i386/desc.h        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6-execshield-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-execshield-fixes.patch	9 Jan 2006 19:24:08 -0000	1.1
+++ linux-2.6-execshield-fixes.patch	9 Jan 2006 23:30:57 -0000	1.2
@@ -1,6 +1,8 @@
- arch/i386/kernel/traps.c |    2 +-
- include/asm-i386/desc.h  |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ arch/i386/kernel/traps.c       |    2 +-
+ arch/x86_64/ia32/ia32_binfmt.c |    2 +-
+ fs/proc/base.c                 |    2 +-
+ include/asm-i386/desc.h        |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
 
 Index: linux-exec-shield-curr.q/arch/i386/kernel/traps.c
 ===================================================================
@@ -15,6 +17,32 @@
  
  	if (desc1->a != desc2->a || desc1->b != desc2->b) {
  		/*
+Index: linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c
+===================================================================
+--- linux-exec-shield-curr.q.orig/arch/x86_64/ia32/ia32_binfmt.c
++++ linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c
+@@ -388,7 +388,7 @@ int ia32_setup_arg_pages(struct linux_bi
+ EXPORT_SYMBOL(ia32_setup_arg_pages);
+ 
+ static unsigned long
+-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
++elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
+ {
+ 	unsigned long map_addr;
+ 	struct task_struct *me = current; 
+Index: linux-exec-shield-curr.q/fs/proc/base.c
+===================================================================
+--- linux-exec-shield-curr.q.orig/fs/proc/base.c
++++ linux-exec-shield-curr.q/fs/proc/base.c
+@@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[
+ 	E(PROC_TGID_EXE,       "exe",     S_IFLNK|S_IRWXUGO),
+ 	E(PROC_TGID_MOUNTS,    "mounts",  S_IFREG|S_IRUGO),
+ #ifdef CONFIG_MMU
+-	E(PROC_TGID_SMAPS,     "smaps",   S_IFREG|S_IRUGO),
++	E(PROC_TGID_SMAPS,     "smaps",   S_IFREG|S_IRUSR),
+ #endif
+ #ifdef CONFIG_SECURITY
+ 	E(PROC_TGID_ATTR,      "attr",    S_IFDIR|S_IRUGO|S_IXUGO),
 Index: linux-exec-shield-curr.q/include/asm-i386/desc.h
 ===================================================================
 --- linux-exec-shield-curr.q.orig/include/asm-i386/desc.h
@@ -28,14 +56,3 @@
  
  extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
  extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
---- linux-2.6.15/fs/proc/base.c~	2006-01-09 14:23:23.000000000 -0500
-+++ linux-2.6.15/fs/proc/base.c	2006-01-09 14:23:34.000000000 -0500
-@@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[
- 	E(PROC_TGID_EXE,       "exe",     S_IFLNK|S_IRWXUGO),
- 	E(PROC_TGID_MOUNTS,    "mounts",  S_IFREG|S_IRUGO),
- #ifdef CONFIG_MMU
--	E(PROC_TGID_SMAPS,     "smaps",   S_IFREG|S_IRUGO),
-+	E(PROC_TGID_SMAPS,     "smaps",   S_IFREG|S_IRUSR),
- #endif
- #ifdef CONFIG_SECURITY
- 	E(PROC_TGID_ATTR,      "attr",    S_IFDIR|S_IRUGO|S_IXUGO),