diff options
| author | Kees Cook <keescook@chromium.org> | 2014-05-21 15:23:46 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2014-07-18 12:13:38 -0700 |
| commit | 1d4457f99928a968767f6405b4a1f50845aa15fd (patch) | |
| tree | 522641b08f4a465035910a74a3871ad38e62df01 /fs/exec.c | |
| parent | 8855d608c145c1ca0e26f4da00741080bb49d80d (diff) | |
| download | lwn-1d4457f99928a968767f6405b4a1f50845aa15fd.tar.gz lwn-1d4457f99928a968767f6405b4a1f50845aa15fd.zip | |
sched: move no_new_privs into new atomic flags
Since seccomp transitions between threads requires updates to the
no_new_privs flag to be atomic, the flag must be part of an atomic flag
set. This moves the nnp flag into a separate task field, and introduces
accessors.
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Andy Lutomirski <luto@amacapital.net>
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c index a3d33fe592d6..0f5c272410f6 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1234,7 +1234,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm) * This isn't strictly necessary, but it makes it harder for LSMs to * mess up. */ - if (current->no_new_privs) + if (task_no_new_privs(current)) bprm->unsafe |= LSM_UNSAFE_NO_NEW_PRIVS; t = p; @@ -1272,7 +1272,7 @@ int prepare_binprm(struct linux_binprm *bprm) bprm->cred->egid = current_egid(); if (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) && - !current->no_new_privs && + !task_no_new_privs(current) && kuid_has_mapping(bprm->cred->user_ns, inode->i_uid) && kgid_has_mapping(bprm->cred->user_ns, inode->i_gid)) { /* Set-uid? */ |