From 514de885ecbcf3d678d95e0ae560ac0731865ff5 Mon Sep 17 00:00:00 2001
From: Dmitri Monakhov <dmonakhov@openvz.org>
Date: Mon, 1 Dec 2008 14:34:56 -0800
Subject: [PATCH] --- yaml --- r: 125759 b: refs/heads/master c:
 7f5ff766a7babd72fc192125e12ef5570effff4c h: refs/heads/master i:   125757:
 99ef29cd665ca1ed056f32278faed60dbffa78f6   125755:
 044df22acc6b92fc9c9582f48ff7907c263debd8   125751:
 465b5dac5298b53b48f641474d33a19313fbae0b   125743:
 4b0d7d9a9ba7924dd24549c0c9bc9c71e224e7f3   125727:
 9c2e49d07c59bb7b5dd4466aa94fbabacc6d54b0   125695:
 66381b6b47588931d24caa9be4d080c10f9143c1 v: v3

---
 [refs]             | 2 +-
 trunk/mm/filemap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 17c72ffbd8e0..8b7a4fccc483 100644
--- 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
index f3e5f8944d17..ed53ce876259 100644
--- 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;