Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 399bfdb9e2da..3976613db829 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;