Revert "cgroup/cpuset: Prevent UAF in proc_cpuset_show()"
This reverts commit 106a2662b1
.
This commit is contained in:
parent
6ab3af7f42
commit
9947944ca2
1 changed files with 4 additions and 9 deletions
|
@ -22,7 +22,6 @@
|
||||||
* distribution for more details.
|
* distribution for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "cgroup-internal.h"
|
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <linux/cpuset.h>
|
#include <linux/cpuset.h>
|
||||||
|
@ -3780,14 +3779,10 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
|
||||||
if (!buf)
|
if (!buf)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
rcu_read_lock();
|
css = task_get_css(tsk, cpuset_cgrp_id);
|
||||||
spin_lock_irq(&css_set_lock);
|
retval = cgroup_path_ns(css->cgroup, buf, PATH_MAX,
|
||||||
css = task_css(tsk, cpuset_cgrp_id);
|
current->nsproxy->cgroup_ns);
|
||||||
retval = cgroup_path_ns_locked(css->cgroup, buf, PATH_MAX,
|
css_put(css);
|
||||||
current->nsproxy->cgroup_ns);
|
|
||||||
spin_unlock_irq(&css_set_lock);
|
|
||||||
rcu_read_unlock();
|
|
||||||
|
|
||||||
if (retval >= PATH_MAX)
|
if (retval >= PATH_MAX)
|
||||||
retval = -ENAMETOOLONG;
|
retval = -ENAMETOOLONG;
|
||||||
if (retval < 0)
|
if (retval < 0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue