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

[Dann Frazier]

Author: dannf
Date: Thu Aug 25 05:00:38 2011
New Revision: 18006

Log:
cred_guard_mutex was still directly in the task structure in 2.6.32

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-fix-a-race-in-do_io_accounting.patch
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-syscall-stack-personality-races.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-fix-a-race-in-do_io_accounting.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-fix-a-race-in-do_io_accounting.patch	Thu Aug 25 04:57:22 2011	(r18005)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-fix-a-race-in-do_io_accounting.patch	Thu Aug 25 05:00:38 2011	(r18006)
@@ -40,7 +40,7 @@
  
 -	if (!ptrace_may_access(task, PTRACE_MODE_READ))
 -		return -EACCES;
-+	result = mutex_lock_killable(&task->signal->cred_guard_mutex);
++	result = mutex_lock_killable(&task->cred_guard_mutex);
 +	if (result)
 +		return result;
 +
@@ -65,7 +65,7 @@
  			(unsigned long long)acct.write_bytes,
  			(unsigned long long)acct.cancelled_write_bytes);
 +out_unlock:
-+	mutex_unlock(&task->signal->cred_guard_mutex);
++	mutex_unlock(&task->cred_guard_mutex);
 +	return result;
  }
  

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-syscall-stack-personality-races.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-syscall-stack-personality-races.patch	Thu Aug 25 04:57:22 2011	(r18005)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-syscall-stack-personality-races.patch	Thu Aug 25 05:00:38 2011	(r18006)
@@ -24,11 +24,11 @@
  
 +static int lock_trace(struct task_struct *task)
 +{
-+	int err = mutex_lock_killable(&task->signal->cred_guard_mutex);
++	int err = mutex_lock_killable(&task->cred_guard_mutex);
 +	if (err)
 +		return err;
 +	if (!ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
-+		mutex_unlock(&task->signal->cred_guard_mutex);
++		mutex_unlock(&task->cred_guard_mutex);
 +		return -EPERM;
 +	}
 +	return 0;
@@ -36,7 +36,7 @@
 +
 +static void unlock_trace(struct task_struct *task)
 +{
-+	mutex_unlock(&task->signal->cred_guard_mutex);
++	mutex_unlock(&task->cred_guard_mutex);
 +}
 +
  #ifdef CONFIG_STACKTRACE