[kernel] r7014 - in dists/sid/linux-2.6.16/debian/patches: .

[Bastian Blank]

Author: waldi
Date: Sat Jul 15 13:07:19 2006
New Revision: 7014

Added:
   dists/sid/linux-2.6.16/debian/patches/fs-proc-relax-fix.patch
      - copied, changed from r7011, /dists/sid/linux-2.6.16/debian/patches/relax-proc-fix.patch
Removed:
   dists/sid/linux-2.6.16/debian/patches/relax-proc-fix.patch
Modified:
   dists/sid/linux-2.6.16/debian/patches/series/17

Log:
* debian/patches/series/17: Fix patch name.
* debian/patches/fs-proc-relax-fix.patch
  - Fix patch name.
  - Make appliable.


Copied: dists/sid/linux-2.6.16/debian/patches/fs-proc-relax-fix.patch (from r7011, /dists/sid/linux-2.6.16/debian/patches/relax-proc-fix.patch)
==============================================================================
--- /dists/sid/linux-2.6.16/debian/patches/relax-proc-fix.patch	(original)
+++ dists/sid/linux-2.6.16/debian/patches/fs-proc-relax-fix.patch	Sat Jul 15 13:07:19 2006
@@ -1,19 +1,6 @@
-From: Linus Torvalds <torvalds at g5.osdl.org>
-Date: Sat, 15 Jul 2006 04:48:03 +0000 (-0700)
-Subject: Relax /proc fix a bit
-X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9ee8ab9fbf21e6b87ad227cd46c0a4be41ab749b
-
-Relax /proc fix a bit
-
-Clearign all of i_mode was a bit draconian. We only really care about
-S_ISUID/ISGID, after all.
-
-Signed-off-by: Linus Torvalds <torvalds at osdl.org>
----
-
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -1338,8 +1338,8 @@ static int pid_revalidate(struct dentry 
+@@ -1338,7 +1338,7 @@
  		} else {
  			inode->i_uid = 0;
  			inode->i_gid = 0;
@@ -21,13 +8,11 @@
  		}
 +		inode->i_mode &= ~(S_ISUID | S_ISGID);
  		security_task_to_inode(task, inode);
- 		put_task_struct(task);
  		return 1;
-@@ -1390,6 +1390,7 @@ static int tid_fd_revalidate(struct dent
- 					inode->i_uid = 0;
- 					inode->i_gid = 0;
- 				}
-+				inode->i_mode &= ~(S_ISUID | S_ISGID);
- 				security_task_to_inode(task, inode);
- 				put_task_struct(task);
- 				return 1;
+@@ -1390,5 +1390,6 @@
+ 				inode->i_uid = 0;
+ 				inode->i_gid = 0;
+ 			}
++			inode->i_mode &= ~(S_ISUID | S_ISGID);
+ 			security_task_to_inode(task, inode);
+ 			return 1;

Modified: dists/sid/linux-2.6.16/debian/patches/series/17
==============================================================================
--- dists/sid/linux-2.6.16/debian/patches/series/17	(original)
+++ dists/sid/linux-2.6.16/debian/patches/series/17	Sat Jul 15 13:07:19 2006
@@ -5,4 +5,4 @@
 + mips-ip22-rtcfix.patch
 + mips-ip22-serial-fix.patch
 + 2.6.16.25
-+ relax-proc-fix.patch
++ fs-proc-relax-fix.patch