diff options
| author | Ma Shimiao <mashimiao.fnst@cn.fujitsu.com> | 2017-12-12 09:43:49 +0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-12-12 07:53:29 -0800 |
| commit | e7fd37ba12170cc414be8b639dfc2c5f7172fac2 (patch) | |
| tree | c8e28735d16cf75f102f08bc9500f5b128a42bc2 /kernel | |
| parent | c2f31b79d510ec1a27138bdcf2d0ece1080be85e (diff) | |
| download | talos-obmc-linux-e7fd37ba12170cc414be8b639dfc2c5f7172fac2.tar.gz talos-obmc-linux-e7fd37ba12170cc414be8b639dfc2c5f7172fac2.zip | |
cgroup: avoid copying strings longer than the buffers
cgroup root name and file name have max length limit, we should
avoid copying longer name than that to the name.
tj: minor update to $SUBJ.
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup/cgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 0b1ffe147f24..18d71fbd3923 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -1397,7 +1397,7 @@ static char *cgroup_file_name(struct cgroup *cgrp, const struct cftype *cft, cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name, cft->name); else - strncpy(buf, cft->name, CGROUP_FILE_NAME_MAX); + strscpy(buf, cft->name, CGROUP_FILE_NAME_MAX); return buf; } @@ -1864,9 +1864,9 @@ void init_cgroup_root(struct cgroup_root *root, struct cgroup_sb_opts *opts) root->flags = opts->flags; if (opts->release_agent) - strcpy(root->release_agent_path, opts->release_agent); + strscpy(root->release_agent_path, opts->release_agent, PATH_MAX); if (opts->name) - strcpy(root->name, opts->name); + strscpy(root->name, opts->name, MAX_CGROUP_ROOT_NAMELEN); if (opts->cpuset_clone_children) set_bit(CGRP_CPUSET_CLONE_CHILDREN, &root->cgrp.flags); } |
