From: Serge Hallyn Date: Thu, 30 Oct 2008 16:52:23 +0000 (-0500) Subject: file caps: always start with clear bprm->caps_* X-Git-Tag: v2.6.26.8~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98555a502f4a5d714b99b697942df256b0633ad;p=thirdparty%2Fkernel%2Fstable.git file caps: always start with clear bprm->caps_* commit 3318a386e4ca68c76e0294363d29bdc46fcad670 upstream 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 Acked-by: David Howells Acked-by: Andrew G. Morgan Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- diff --git a/security/commoncap.c b/security/commoncap.c index 33d3433084134..17fc5ab71db6a 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -247,10 +247,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;