projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spi: dspi: clear SPI_SR before enable interrupt
[cascardo/linux.git]
/
kernel
/
cpuset.c
diff --git
a/kernel/cpuset.c
b/kernel/cpuset.c
index
2b4c20a
..
29f815d
100644
(file)
--- a/
kernel/cpuset.c
+++ b/
kernel/cpuset.c
@@
-2715,7
+2715,7
@@
void __cpuset_memory_pressure_bump(void)
int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *tsk)
{
int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *tsk)
{
- char *buf
, *p
;
+ char *buf;
struct cgroup_subsys_state *css;
int retval;
struct cgroup_subsys_state *css;
int retval;
@@
-2724,14
+2724,15
@@
int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
if (!buf)
goto out;
if (!buf)
goto out;
- retval = -ENAMETOOLONG;
css = task_get_css(tsk, cpuset_cgrp_id);
css = task_get_css(tsk, cpuset_cgrp_id);
-
p
= cgroup_path_ns(css->cgroup, buf, PATH_MAX,
- current->nsproxy->cgroup_ns);
+
retval
= cgroup_path_ns(css->cgroup, buf, PATH_MAX,
+
current->nsproxy->cgroup_ns);
css_put(css);
css_put(css);
- if (!p)
+ if (retval >= PATH_MAX)
+ retval = -ENAMETOOLONG;
+ if (retval < 0)
goto out_free;
goto out_free;
- seq_puts(m,
p
);
+ seq_puts(m,
buf
);
seq_putc(m, '\n');
retval = 0;
out_free:
seq_putc(m, '\n');
retval = 0;
out_free: