diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2011-11-16 23:37:59 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 14:59:23 -0700 |
| commit | 9e4a36ece652908276bc4abb4324ec56292453e1 (patch) | |
| tree | ec267b9350f9e06aa510e35fbd6858ba3b9d602c | |
| parent | a7c1938e22c02b008655524c766d185ae99d9d53 (diff) | |
| download | op-kernel-dev-9e4a36ece652908276bc4abb4324ec56292453e1.zip op-kernel-dev-9e4a36ece652908276bc4abb4324ec56292453e1.tar.gz | |
userns: Fail exec for suid and sgid binaries with ids outside our user namespace.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | fs/exec.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1291,8 +1291,11 @@ int prepare_binprm(struct linux_binprm *bprm) if (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)) { /* Set-uid? */ if (mode & S_ISUID) { + if (!kuid_has_mapping(bprm->cred->user_ns, inode->i_uid)) + return -EPERM; bprm->per_clear |= PER_CLEAR_ON_SETID; bprm->cred->euid = inode->i_uid; + } /* Set-gid? */ @@ -1302,6 +1305,8 @@ int prepare_binprm(struct linux_binprm *bprm) * executable. */ if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { + if (!kgid_has_mapping(bprm->cred->user_ns, inode->i_gid)) + return -EPERM; bprm->per_clear |= PER_CLEAR_ON_SETID; bprm->cred->egid = inode->i_gid; } |
