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

[Dann Frazier]

Author: dannf
Date: Wed Aug 24 20:04:03 2011
New Revision: 17994

Log:
adjust offsets to apply

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-restrict-access-to-proc-pid-io.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-restrict-access-to-proc-pid-io.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-restrict-access-to-proc-pid-io.patch	Wed Aug 24 16:47:06 2011	(r17993)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/proc-restrict-access-to-proc-pid-io.patch	Wed Aug 24 20:04:03 2011	(r17994)
@@ -15,12 +15,13 @@
     
     Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+    [dannf: backported to Debian's 2.6.32]
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 8a84210..fc5bc27 100644
+index 3d09a10..7b5819c 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2708,6 +2708,9 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole)
+@@ -2454,6 +2454,9 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole)
  	struct task_io_accounting acct = task->ioac;
  	unsigned long flags;
  
@@ -30,21 +31,21 @@
  	if (whole && lock_task_sighand(task, &flags)) {
  		struct task_struct *t = task;
  
-@@ -2839,7 +2842,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2575,7 +2578,7 @@ static const struct pid_entry tgid_base_stuff[] = {
  	REG("coredump_filter", S_IRUGO|S_IWUSR, proc_coredump_filter_operations),
  #endif
  #ifdef CONFIG_TASK_IO_ACCOUNTING
 -	INF("io",	S_IRUGO, proc_tgid_io_accounting),
 +	INF("io",	S_IRUSR, proc_tgid_io_accounting),
  #endif
- #ifdef CONFIG_HARDWALL
- 	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
-@@ -3181,7 +3184,7 @@ static const struct pid_entry tid_base_stuff[] = {
+ };
+ 
+@@ -2910,7 +2913,7 @@ static const struct pid_entry tid_base_stuff[] = {
  	REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations),
  #endif
  #ifdef CONFIG_TASK_IO_ACCOUNTING
 -	INF("io",	S_IRUGO, proc_tid_io_accounting),
 +	INF("io",	S_IRUSR, proc_tid_io_accounting),
  #endif
- #ifdef CONFIG_HARDWALL
- 	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
+ };
+