rpms/kernel/devel linux-2.6-execshield.patch,1.62,1.63

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29833

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
build fix

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- linux-2.6-execshield.patch	20 Jul 2007 21:26:41 -0000	1.62
+++ linux-2.6-execshield.patch	20 Jul 2007 22:08:16 -0000	1.63
@@ -926,21 +926,23 @@
  	if (current->personality & MMAP_PAGE_ZERO) {
  		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,
  		   and some applications "depend" upon this behavior.
---- linux-2.6.22.noarch/fs/proc/array.c~	2007-07-20 14:07:45.000000000 -0400
-+++ linux-2.6.22.noarch/fs/proc/array.c	2007-07-20 14:10:13.000000000 -0400
-@@ -440,7 +440,11 @@ static int do_task_stat(struct task_stru
+--- linux-2.6.22.noarch/fs/proc/array.c~	2007-07-20 18:06:40.000000000 -0400
++++ linux-2.6.22.noarch/fs/proc/array.c	2007-07-20 18:07:50.000000000 -0400
+@@ -439,8 +439,12 @@ static int do_task_stat(struct task_stru
+ 	}
  	rcu_read_unlock();
  
- 	if (!whole || num_threads < 2) {
+-	if (!whole || num_threads < 2)
 -		wchan = get_wchan(task);
++	if (!whole || num_threads < 2) {
 +		wchan = 0;
 +		if (current->uid == task->uid || current->euid == task->uid ||
 +			capable(CAP_SYS_NICE))
 +				wchan = get_wchan(task);
 +	}
+ 
  	if (!whole) {
  		min_flt = task->min_flt;
- 		maj_flt = task->maj_flt;
 Index: linux-2.6/fs/proc/base.c
 ===================================================================
 --- linux-2.6.orig/fs/proc/base.c