diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-13 06:58:38 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-13 06:58:38 -0500 |
| commit | d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af (patch) | |
| tree | 17a4968e339822a520f864fe4127be39e0563f5c /kernel/cgroup.c | |
| parent | a755180bab81c038a6989d7ab746c702f1b3ec03 (diff) | |
| download | op-kernel-dev-d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af.zip op-kernel-dev-d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af.tar.gz | |
cgroup: disallow xattr, release_agent and name if sane_behavior
Disallow more mount options if sane_behavior. Note that xattr used to
generate warning.
While at it, simplify option check in cgroup_mount() and update
sane_behavior comment in cgroup.h.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 03845c5..079c478 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1226,18 +1226,12 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) if (opts->flags & CGRP_ROOT_SANE_BEHAVIOR) { pr_warning("cgroup: sane_behavior: this is still under development and its behaviors will change, proceed at your own risk\n"); - if (opts->flags & CGRP_ROOT_NOPREFIX) { - pr_err("cgroup: sane_behavior: noprefix is not allowed\n"); + if ((opts->flags & (CGRP_ROOT_NOPREFIX | CGRP_ROOT_XATTR)) || + opts->cpuset_clone_children || opts->release_agent || + opts->name) { + pr_err("cgroup: sane_behavior: noprefix, xattr, clone_children, release_agent and name are not allowed\n"); return -EINVAL; } - - if (opts->cpuset_clone_children) { - pr_err("cgroup: sane_behavior: clone_children is not allowed\n"); - return -EINVAL; - } - - if (opts->flags & CGRP_ROOT_XATTR) - pr_warning("cgroup: sane_behavior: xattr is always available, flag unnecessary\n"); } /* |
