]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
file caps: always start with clear bprm->caps_*
authorSerge Hallyn <serue@us.ibm.com>
Thu, 30 Oct 2008 16:52:23 +0000 (11:52 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:49:45 +0000 (09:49 -0700)
While Linux doesn't honor setuid on scripts.  However, it mistakenly
behaves differently for file capabilities.

This patch fixes that behavior by making sure that get_file_caps()
begins with empty bprm->caps_*.  That way when a script is loaded,
its bprm->caps_* may be filled when binfmt_misc calls prepare_binprm(),
but they will be cleared again when binfmt_elf calls prepare_binprm()
next to read the interpreter's file capabilities.

Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Andrew G. Morgan <morgan@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
security/commoncap.c

index 399bfdb9e2da99c4ef81fdd8b0391b1f5571c371..3976613db829044ab435ee21b7a6ad2161a6441c 100644 (file)
@@ -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;