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

[Dann Frazier]

Author: dannf
Date: Wed Feb  3 06:55:27 2010
New Revision: 15106

Log:
adjust to apply

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	Wed Feb  3 00:48:52 2010	(r15105)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Wed Feb  3 06:55:27 2010	(r15106)
@@ -7865,7 +7865,7 @@
  
  		tsk->group_leader = tsk;
  		leader->group_leader = tsk;
-@@ -964,12 +994,10 @@ int flush_old_exec(struct linux_binprm * bprm)
+@@ -963,11 +993,10 @@ int flush_old_exec(struct linux_binprm *
  	/*
  	 * Release all of the old mmap stuff
  	 */
@@ -7875,10 +7875,9 @@
  		goto out;
  
 -	bprm->mm = NULL;		/* We're using it now */
--
- 	/* This is the point of no return */
- 	current->sas_ss_sp = current->sas_ss_size = 0;
+ 	return 0;
  
+ out:
 @@ -1275,6 +1303,10 @@ int do_execve(char * filename,
  	struct files_struct *displaced;
  	int retval;