[kernel] r13442 - dists/lenny-security/linux-2.6/debian/patches/features/all/vserver

[Dann Frazier]

Author: dannf
Date: Sat Apr 18 21:14:52 2009
New Revision: 13442

Log:
adjust to apply after bugfix/all/limit_kill_sig_-1_to_callers_namespace.patch

Modified:
   dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch	Sat Apr 18 21:00:26 2009	(r13441)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch	Sat Apr 18 21:14:52 2009	(r13442)
@@ -16725,17 +16725,16 @@
  		ret = -ESRCH;
  		goto out_unlock;
  	}
-@@ -1145,7 +1167,9 @@ static int kill_something_info(int sig, 
+@@ -1145,6 +1167,9 @@
  		struct task_struct * p;
  
  		for_each_process(p) {
--			if (p->pid > 1 && !same_thread_group(p, current)) {
 +			if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
-+				p->pid > 1 && !same_thread_group(p, current) &&
++			    	task_pid_vnr(p) > 1 && !same_thread_group(p, current) &&
 +				!vx_current_initpid(p->pid)) {
+ 			if (task_pid_vnr(p) > 1 &&
+ 					!same_thread_group(p, current)) {
  				int err = group_send_sig_info(sig, info, p);
- 				++count;
- 				if (err != -EPERM)
 @@ -1809,6 +1833,11 @@ relock:
  		    !signal_group_exit(signal))
  			continue;