---

yaml --- r: 125759 b: refs/heads/master c: 7f5ff76 h: refs/heads/master i: 125757: 99ef29c 125755: 044df22 125751: 465b5da 125743: 4b0d7d9 125727: 9c2e49d 125695: 66381b6 v: v3
git-mirror · Jan 5, 2009 · 514de88 · 514de88
1 parent 67626ff
commit 514de88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6f1eb97d462a45be3b30759758b5fdbb562c8c
+refs/heads/master: 7f5ff766a7babd72fc192125e12ef5570effff4c
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
@@ -1766,7 +1766,7 @@ int should_remove_suid(struct dentry *dentry)
 	if (unlikely((mode & S_ISGID) && (mode & S_IXGRP)))
 		kill |= ATTR_KILL_SGID;
 
-	if (unlikely(kill && !capable(CAP_FSETID)))
+	if (unlikely(kill && !capable(CAP_FSETID) && S_ISREG(mode)))
 		return kill;
 
 	return 0;