rpms/kernel/devel linux-2.6-execshield.patch,1.99,1.100

Dave Jones davej at fedoraproject.org
Mon Dec 29 03:27:28 UTC 2008


Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9125

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
build fix. euid/uid are now in creds struct

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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- linux-2.6-execshield.patch	29 Dec 2008 02:48:00 -0000	1.99
+++ linux-2.6-execshield.patch	29 Dec 2008 03:27:27 -0000	1.100
@@ -564,15 +564,18 @@
 index 6af7fba..bb98552 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
-@@ -412,8 +412,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -412,8 +412,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
 -	if (!whole || num_threads < 2)
 -		wchan = get_wchan(task);
 +	if (!whole || num_threads < 2) {
++		const struct cred *cred;
++
 +		wchan = 0;
-+		if (current->uid == task->uid || current->euid == task->uid ||
++		cred = __task_cred(task);
++		if (current_uid() == cred->uid || current_euid() == cred->uid ||
 +			capable(CAP_SYS_NICE))
 +				wchan = get_wchan(task);
 +	}




More information about the fedora-extras-commits mailing list