rpms/kernel/devel .cvsignore, 1.167, 1.168 kernel-2.6.spec, 1.1408, 1.1409 linux-2.6.11-execshield-vdso.patch, 1.6, 1.7 sources, 1.140, 1.141

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6.11-execshield-vdso.patch 
	sources 
Log Message:
Add a vdso marker to /proc/*/maps even if the vDSO is randomized



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- .cvsignore	30 Jun 2005 19:25:47 -0000	1.167
+++ .cvsignore	1 Jul 2005 21:56:28 -0000	1.168
@@ -6,8 +6,4 @@
 temp-*
 kernel-2.6.12
 linux-2.6.12.tar.bz2
-patch-2.6.12-git5.bz2
-patch-2.6.12-git8.bz2
-patch-2.6.12-git9.bz2
-patch-2.6.12-git10.bz2
 patch-2.6.13-rc1-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1408
retrieving revision 1.1409
diff -u -r1.1408 -r1.1409
--- kernel-2.6.spec	30 Jun 2005 19:25:47 -0000	1.1408
+++ kernel-2.6.spec	1 Jul 2005 21:56:28 -0000	1.1409
@@ -1242,6 +1242,9 @@
 %endif
 
 %changelog
+* Fri Jul  1 2005 Dave Jones <davej at redhat.com>
+- Add a vdso marker to /proc/*/maps even if the vDSO is randomized
+
 * Thu Jun 30 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc1-git2
 

linux-2.6.11-execshield-vdso.patch:
 linux-2.6.11/arch/i386/kernel/sysenter.c   |   71 +++++++++++++++++------------
 linux-2.6.11/fs/binfmt_elf.c               |   17 ++----
 linux-2.6.11/include/asm-i386/elf.h        |    7 ++
 linux-2.6.11/include/asm-i386/page.h       |    5 ++
 linux-2.6.11/include/linux/mm.h            |    5 ++
 linux-2.6.11/mm/mmap.c                     |   39 +++++++++++++++
 linux-2.6.12/arch/i386/kernel/cpu/common.c |   10 ++--
 linux-2.6.8/arch/i386/kernel/cpu/common.c  |    6 ++
 linux/fs/proc/task_mmu.c                   |   15 ++++--
 9 files changed, 128 insertions(+), 47 deletions(-)

Index: linux-2.6.11-execshield-vdso.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield-vdso.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6.11-execshield-vdso.patch	21 Jun 2005 20:55:05 -0000	1.6
+++ linux-2.6.11-execshield-vdso.patch	1 Jul 2005 21:56:28 -0000	1.7
@@ -282,3 +282,39 @@
  
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
+
+btw., the patch below (against 1381-FC4) adds a vdso marker to
+/proc/*/maps even if the vDSO is randomized a'ka Roland's patch.
+
+	Ingo
+
+Index: linux/fs/proc/task_mmu.c
+===================================================================
+--- linux.orig/fs/proc/task_mmu.c
++++ linux/fs/proc/task_mmu.c
+@@ -142,14 +142,19 @@ static int show_map(struct seq_file *m, 
+ 			if (map->vm_end == mm->brk) {
+ 				pad_len_spaces(m, len);
+ 				seq_puts(m, "[heap]");
+-			} else {
+-				if (map->vm_start <= mm->start_stack &&
++			} else if (map->vm_start <= mm->start_stack &&
+ 					map->vm_end >= mm->start_stack) {
+ 
+-					pad_len_spaces(m, len);
+-					seq_puts(m, "[stack]");
+-				}
++				pad_len_spaces(m, len);
++				seq_puts(m, "[stack]");
++			}
++#ifdef __i386__
++			else if (map->vm_start ==
++					(unsigned long)mm->context.vdso) {
++				pad_len_spaces(m, len);
++				seq_puts(m, "[vdso]");
+ 			}
++#endif
+ 		} else {
+ 			pad_len_spaces(m, len);
+ 			seq_puts(m, "[vdso]");
+


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	30 Jun 2005 19:25:47 -0000	1.140
+++ sources	1 Jul 2005 21:56:28 -0000	1.141
@@ -1,3 +1,2 @@
 c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
-0fb49cf3b412572808fb726746e16c96  patch-2.6.12-git5.bz2
 91f1addd9b6e251145ee7bc1b9b49e3c  patch-2.6.13-rc1-git2.bz2