[kernel] r13441 - dists/lenny-security/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Sat Apr 18 21:00:26 2009
New Revision: 13441

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/openvz/openvz.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Apr 18 20:55:14 2009	(r13440)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Apr 18 21:00:26 2009	(r13441)
@@ -62133,15 +62133,15 @@
  			unlock_task_sighand(p, &flags);
  		}
  	}
-@@ -1144,7 +1183,7 @@ static int kill_something_info(int sig, struct siginfo *info, int pid)
+@@ -1144,7 +1183,7 @@ static int kill_something_info(int sig, 
  		int retval = 0, count = 0;
  		struct task_struct * p;
  
 -		for_each_process(p) {
 +		for_each_process_ve(p) {
- 			if (p->pid > 1 && !same_thread_group(p, current)) {
+ 			if (task_pid_vnr(p) > 1 &&
+ 					!same_thread_group(p, current)) {
  				int err = group_send_sig_info(sig, info, p);
- 				++count;
 @@ -1359,6 +1398,14 @@ void do_notify_parent(struct task_struct *tsk, int sig)
  	BUG_ON(!tsk->ptrace &&
  	       (tsk->group_leader != tsk || !thread_group_empty(tsk)));