From 67dfe8204dc402112681cd9bb0159e0f80cb0a08 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 14 Jul 2006 21:48:03 -0700
Subject: [PATCH] --- yaml --- r: 32607 b: refs/heads/master c:
 9ee8ab9fbf21e6b87ad227cd46c0a4be41ab749b h: refs/heads/master i:   32605:
 93fa7c32859a2fca027c51ba58a22cdbcc871c18   32603:
 4ec1a61a5c63323acddf0d1a2ba21304927fe386   32599:
 da1ef77a0a493e28cda57e00de4767b4a7294cb0   32591:
 d0466156e2629f8408c2ff30f65d63d2594845ec   32575:
 0419957c6f58b546dc69c97299b81dfccb14ddd4 v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4530da54e725..2ba3a83350e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18b0bbd8ca6d3cb90425aa0d77b99a762c6d6de3
+refs/heads/master: 9ee8ab9fbf21e6b87ad227cd46c0a4be41ab749b
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 0cb8f20d000c..474eae345068 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -1338,8 +1338,8 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
 		} else {
 			inode->i_uid = 0;
 			inode->i_gid = 0;
-			inode->i_mode = 0;
 		}
+		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 dentry *dentry, struct nameidata *nd)
 					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;