mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 14:04:54 +02:00
cgroup: Use open-time credentials for process migraton perm checks
commit1756d7994aupstream. cgroup process migration permission checks are performed at write time as whether a given operation is allowed or not is dependent on the content of the write - the PID. This currently uses current's credentials which is a potential security weakness as it may allow scenarios where a less privileged process tricks a more privileged one into writing into a fd that it created. This patch makes both cgroup2 and cgroup1 process migration interfaces to use the credentials saved at the time of open (file->f_cred) instead of current's. Reported-by: "Eric W. Biederman" <ebiederm@xmission.com> Suggested-by: Linus Torvalds <torvalds@linuxfoundation.org> Fixes:187fe84067("cgroup: require write perm on common ancestor when moving processes on the default hierarchy") Reviewed-by: Michal Koutný <mkoutny@suse.com> Signed-off-by: Tejun Heo <tj@kernel.org> [OP: apply original __cgroup_procs_write() changes to cgroup_threads_write() and cgroup_procs_write(), as the refactoring commitda70862efe("cgroup: cgroup.{procs,threads} factor out common parts") is not present in 5.10-stable] Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f089471d1b
commit
4665722d36
|
|
@ -505,10 +505,11 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of,
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Even if we're attaching all tasks in the thread group, we only
|
* Even if we're attaching all tasks in the thread group, we only need
|
||||||
* need to check permissions on one of them.
|
* to check permissions on one of them. Check permissions using the
|
||||||
|
* credentials from file open to protect against inherited fd attacks.
|
||||||
*/
|
*/
|
||||||
cred = current_cred();
|
cred = of->file->f_cred;
|
||||||
tcred = get_task_cred(task);
|
tcred = get_task_cred(task);
|
||||||
if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) &&
|
if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) &&
|
||||||
!uid_eq(cred->euid, tcred->uid) &&
|
!uid_eq(cred->euid, tcred->uid) &&
|
||||||
|
|
|
||||||
|
|
@ -4788,6 +4788,7 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of,
|
||||||
struct cgroup_file_ctx *ctx = of->priv;
|
struct cgroup_file_ctx *ctx = of->priv;
|
||||||
struct cgroup *src_cgrp, *dst_cgrp;
|
struct cgroup *src_cgrp, *dst_cgrp;
|
||||||
struct task_struct *task;
|
struct task_struct *task;
|
||||||
|
const struct cred *saved_cred;
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
bool locked;
|
bool locked;
|
||||||
|
|
||||||
|
|
@ -4805,9 +4806,16 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of,
|
||||||
src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root);
|
src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root);
|
||||||
spin_unlock_irq(&css_set_lock);
|
spin_unlock_irq(&css_set_lock);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Process and thread migrations follow same delegation rule. Check
|
||||||
|
* permissions using the credentials from file open to protect against
|
||||||
|
* inherited fd attacks.
|
||||||
|
*/
|
||||||
|
saved_cred = override_creds(of->file->f_cred);
|
||||||
ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
|
ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
|
||||||
of->file->f_path.dentry->d_sb, true,
|
of->file->f_path.dentry->d_sb, true,
|
||||||
ctx->ns);
|
ctx->ns);
|
||||||
|
revert_creds(saved_cred);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_finish;
|
goto out_finish;
|
||||||
|
|
||||||
|
|
@ -4832,6 +4840,7 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of,
|
||||||
struct cgroup_file_ctx *ctx = of->priv;
|
struct cgroup_file_ctx *ctx = of->priv;
|
||||||
struct cgroup *src_cgrp, *dst_cgrp;
|
struct cgroup *src_cgrp, *dst_cgrp;
|
||||||
struct task_struct *task;
|
struct task_struct *task;
|
||||||
|
const struct cred *saved_cred;
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
bool locked;
|
bool locked;
|
||||||
|
|
||||||
|
|
@ -4851,10 +4860,16 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of,
|
||||||
src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root);
|
src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root);
|
||||||
spin_unlock_irq(&css_set_lock);
|
spin_unlock_irq(&css_set_lock);
|
||||||
|
|
||||||
/* thread migrations follow the cgroup.procs delegation rule */
|
/*
|
||||||
|
* Process and thread migrations follow same delegation rule. Check
|
||||||
|
* permissions using the credentials from file open to protect against
|
||||||
|
* inherited fd attacks.
|
||||||
|
*/
|
||||||
|
saved_cred = override_creds(of->file->f_cred);
|
||||||
ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
|
ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
|
||||||
of->file->f_path.dentry->d_sb, false,
|
of->file->f_path.dentry->d_sb, false,
|
||||||
ctx->ns);
|
ctx->ns);
|
||||||
|
revert_creds(saved_cred);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_finish;
|
goto out_finish;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user