cgroup-v1: Require capabilities to set release_agent
The cgroup release_agent is called with call_usermodehelper. The function
call_usermodehelper starts the release_agent with a full set fo capabilities.
Therefore require capabilities when setting the release_agaent.
Reported-by: Tabitha Sable <tabitha.c.sable@gmail.com>
Tested-by: Tabitha Sable <tabitha.c.sable@gmail.com>
Fixes: 81a6a5cdd2
("Task Control Groups: automatic userspace notification of idle cgroups")
Cc: stable@vger.kernel.org # v2.6.24+
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Родитель
c80d401c52
Коммит
24f6008564
|
@ -549,6 +549,14 @@ static ssize_t cgroup_release_agent_write(struct kernfs_open_file *of,
|
||||||
|
|
||||||
BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
|
BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Release agent gets called with all capabilities,
|
||||||
|
* require capabilities to set release agent.
|
||||||
|
*/
|
||||||
|
if ((of->file->f_cred->user_ns != &init_user_ns) ||
|
||||||
|
!capable(CAP_SYS_ADMIN))
|
||||||
|
return -EPERM;
|
||||||
|
|
||||||
cgrp = cgroup_kn_lock_live(of->kn, false);
|
cgrp = cgroup_kn_lock_live(of->kn, false);
|
||||||
if (!cgrp)
|
if (!cgrp)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -954,6 +962,12 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
|
||||||
/* Specifying two release agents is forbidden */
|
/* Specifying two release agents is forbidden */
|
||||||
if (ctx->release_agent)
|
if (ctx->release_agent)
|
||||||
return invalfc(fc, "release_agent respecified");
|
return invalfc(fc, "release_agent respecified");
|
||||||
|
/*
|
||||||
|
* Release agent gets called with all capabilities,
|
||||||
|
* require capabilities to set release agent.
|
||||||
|
*/
|
||||||
|
if ((fc->user_ns != &init_user_ns) || !capable(CAP_SYS_ADMIN))
|
||||||
|
return invalfc(fc, "Setting release_agent not allowed");
|
||||||
ctx->release_agent = param->string;
|
ctx->release_agent = param->string;
|
||||||
param->string = NULL;
|
param->string = NULL;
|
||||||
break;
|
break;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче