diff options
| author | Tejun Heo <tj@kernel.org> | 2016-09-29 11:58:36 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-09-29 15:55:02 +0200 |
| commit | 679a5e3f12830392d14f94b04bbe0f3cabdbd773 (patch) | |
| tree | 075922558e658517eb69a5276f458ee7e97add06 | |
| parent | ed1777de25e45bfb58fad63341904f8a77911785 (diff) | |
| download | linux-679a5e3f12830392d14f94b04bbe0f3cabdbd773.tar.gz linux-679a5e3f12830392d14f94b04bbe0f3cabdbd773.tar.bz2 linux-679a5e3f12830392d14f94b04bbe0f3cabdbd773.zip | |
cpuset: fix error handling regression in proc_cpuset_show()
4c737b41de7f ("cgroup: make cgroup_path() and friends behave in the
style of strlcpy()") botched the conversion of proc_cpuset_show() and
broke its error handling. It made the function return 0 on failures
and fail to handle error returns from cgroup_path_ns(). Fix it.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | kernel/cpuset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 793ae6fd96dc..97dd8e178786 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -2698,12 +2698,13 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns, if (!buf) goto out; - retval = -ENAMETOOLONG; css = task_get_css(tsk, cpuset_cgrp_id); retval = cgroup_path_ns(css->cgroup, buf, PATH_MAX, current->nsproxy->cgroup_ns); css_put(css); if (retval >= PATH_MAX) + retval = -ENAMETOOLONG; + if (retval < 0) goto out_free; seq_puts(m, buf); seq_putc(m, '\n'); @@ -2711,7 +2712,7 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns, out_free: kfree(buf); out: - return 0; + return retval; } #endif /* CONFIG_PROC_PID_CPUSET */ |