* [PATCH cgroup/for-4.9] cpuset: fix error error handling regression in proc_cpuset_show()
[not found] <20160929092722.GA5513@mwanda>
@ 2016-09-29 9:58 ` Tejun Heo
2016-09-29 13:27 ` Dan Carpenter
0 siblings, 1 reply; 3+ messages in thread
From: Tejun Heo @ 2016-09-29 9:58 UTC (permalink / raw)
To: Dan Carpenter, Li Zefan; +Cc: Johannes Weiner, cgroups, linux-kernel
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>
---
Hello, Dan.
Does this make the warning go away?
Thanks.
kernel/cpuset.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 793ae6f..97dd8e1 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 */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH cgroup/for-4.9] cpuset: fix error error handling regression in proc_cpuset_show()
2016-09-29 9:58 ` [PATCH cgroup/for-4.9] cpuset: fix error error handling regression in proc_cpuset_show() Tejun Heo
@ 2016-09-29 13:27 ` Dan Carpenter
2016-09-29 13:54 ` [PATCH cgroup/for-4.6] cgroup: fix error handling regressions in proc_cgroup_show() and cgroup_release_agent() Tejun Heo
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2016-09-29 13:27 UTC (permalink / raw)
To: Tejun Heo; +Cc: Li Zefan, Johannes Weiner, cgroups, linux-kernel
That works but there are two other related warnings:
kernel/cgroup.c:5811 proc_cgroup_show() warn: signed compare with PATH_MAX 'retval'
kernel/cgroup.c:6099 cgroup_release_agent() warn: signed compare with PATH_MAX 'ret'
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH cgroup/for-4.6] cgroup: fix error handling regressions in proc_cgroup_show() and cgroup_release_agent()
2016-09-29 13:27 ` Dan Carpenter
@ 2016-09-29 13:54 ` Tejun Heo
0 siblings, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2016-09-29 13:54 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Li Zefan, Johannes Weiner, cgroups, linux-kernel
4c737b41de7f ("cgroup: make cgroup_path() and friends behave in the
style of strlcpy()") broke error handling in proc_cgroup_show() and
cgroup_release_agent() by not handling negative return values from
cgroup_path_ns_locked(). Fix it.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---
kernel/cgroup.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 5e2e81a..a7f9fb4 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5781,10 +5781,10 @@ int proc_cgroup_show(struct seq_file *m, struct pid_namespace *ns,
if (cgroup_on_dfl(cgrp) || !(tsk->flags & PF_EXITING)) {
retval = cgroup_path_ns_locked(cgrp, buf, PATH_MAX,
current->nsproxy->cgroup_ns);
- if (retval >= PATH_MAX) {
+ if (retval >= PATH_MAX)
retval = -ENAMETOOLONG;
+ if (retval < 0)
goto out_unlock;
- }
seq_puts(m, buf);
} else {
@@ -6069,7 +6069,7 @@ static void cgroup_release_agent(struct work_struct *work)
spin_lock_irq(&css_set_lock);
ret = cgroup_path_ns_locked(cgrp, pathbuf, PATH_MAX, &init_cgroup_ns);
spin_unlock_irq(&css_set_lock);
- if (ret >= PATH_MAX)
+ if (ret < 0 || ret >= PATH_MAX)
goto out;
argv[0] = agentbuf;
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-29 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20160929092722.GA5513@mwanda>
2016-09-29 9:58 ` [PATCH cgroup/for-4.9] cpuset: fix error error handling regression in proc_cpuset_show() Tejun Heo
2016-09-29 13:27 ` Dan Carpenter
2016-09-29 13:54 ` [PATCH cgroup/for-4.6] cgroup: fix error handling regressions in proc_cgroup_show() and cgroup_release_agent() Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).