[kernel] r19345 - dists/squeeze-security/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Mon Aug 20 02:32:00 2012
New Revision: 19345

Log:
Adjust patch context

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cred-copy_process-should-clear-child-replacement_session_keyring.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cred-copy_process-should-clear-child-replacement_session_keyring.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cred-copy_process-should-clear-child-replacement_session_keyring.patch	Mon Aug 20 02:05:38 2012	(r19344)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/cred-copy_process-should-clear-child-replacement_session_keyring.patch	Mon Aug 20 02:32:00 2012	(r19345)
@@ -21,16 +21,16 @@
     Acked-by: David Howells <dhowells at redhat.com>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
-diff --git a/kernel/cred.c b/kernel/cred.c
-index 97b36ee..e70683d 100644
+[bwh: Backported to 2.6.32: adjust context]
+
 --- a/kernel/cred.c
 +++ b/kernel/cred.c
-@@ -386,6 +386,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
+@@ -441,6 +441,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
  	struct cred *new;
  	int ret;
  
 +	p->replacement_session_keyring = NULL;
 +
+ 	mutex_init(&p->cred_guard_mutex);
+ 
  	if (
- #ifdef CONFIG_KEYS
- 		!p->cred->thread_keyring &&