X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=security%2Fcommoncap.c;h=3976613db829044ab435ee21b7a6ad2161a6441c;hb=6209344f5a3795d34b7f2c0061f49802283b6bdd;hp=399bfdb9e2da99c4ef81fdd8b0391b1f5571c371;hpb=d3570a5a7b8d0604fa012129f92637dc1534f62c;p=linux-2.6-omap-h63xx.git

diff --git a/security/commoncap.c b/security/commoncap.c
index 399bfdb9e2d..3976613db82 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -279,10 +279,10 @@ static int get_file_caps(struct linux_binprm *bprm)
 	struct vfs_cap_data vcaps;
 	struct inode *inode;
 
-	if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID) {
-		bprm_clear_caps(bprm);
+	bprm_clear_caps(bprm);
+
+	if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID)
 		return 0;
-	}
 
 	dentry = dget(bprm->file->f_dentry);
 	inode = dentry->d_inode;