---

yaml --- r: 118289 b: refs/heads/master c: 3318a38 h: refs/heads/master i: 118287: 79351f3 v: v3
git-mirror · Nov 1, 2008 · e356b5a · e356b5a
1 parent b79d35c
commit e356b5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e06f42d6c127883e58b747048752f44ae208ae47
+refs/heads/master: 3318a386e4ca68c76e0294363d29bdc46fcad670
diff --git a/trunk/security/commoncap.c b/trunk/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;