Skip to content

Commit df02452

Browse files
Ming Leihtejun
authored andcommitted
cgroup: cgroup_get_from_id() must check the looked-up kn is a directory
cgroup has to be one kernfs dir, otherwise kernel panic is caused, especially cgroup id is provide from userspace. Reported-by: Marco Patalano <[email protected]> Fixes: 6b658c4 ("scsi: cgroup: Add cgroup_get_from_id()") Cc: Muneendra <[email protected]> Signed-off-by: Ming Lei <[email protected]> Acked-by: Mukesh Ojha <[email protected]> Cc: [email protected] # v5.14+ Signed-off-by: Tejun Heo <[email protected]>
1 parent a81e18e commit df02452

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

kernel/cgroup/cgroup.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6049,14 +6049,17 @@ struct cgroup *cgroup_get_from_id(u64 id)
60496049
if (!kn)
60506050
goto out;
60516051

6052+
if (kernfs_type(kn) != KERNFS_DIR)
6053+
goto put;
6054+
60526055
rcu_read_lock();
60536056

60546057
cgrp = rcu_dereference(*(void __rcu __force **)&kn->priv);
60556058
if (cgrp && !cgroup_tryget(cgrp))
60566059
cgrp = NULL;
60576060

60586061
rcu_read_unlock();
6059-
6062+
put:
60606063
kernfs_put(kn);
60616064
out:
60626065
return cgrp;

0 commit comments

Comments
 (0)