diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-24 08:36:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-24 08:36:10 -0700 |
| commit | 1772094f12a7b180aa9ab849586f891b14d06d1f (patch) | |
| tree | 588e469443afcf332d0c8a5a0b5372187259dc2a | |
| parent | aae8dda51964ff9d3f1dc96528b853826667efad (diff) | |
| parent | df02452f3df069a59bc9e69c84435bf115cb6e37 (diff) | |
Merge tag 'cgroup-for-6.0-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
- Add Waiman Long as a cpuset maintainer
- cgroup_get_from_id() could be fed a kernfs ID which doesn't point to
a cgroup directory but a knob file and then crash. Error out if the
lookup kernfs_node isn't a directory.
* tag 'cgroup-for-6.0-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: cgroup_get_from_id() must check the looked-up kn is a directory
cpuset: Add Waiman Long as a cpuset maintainer
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | kernel/cgroup/cgroup.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bf6650f41b04..1f40c1135bae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5246,6 +5246,7 @@ F: block/blk-throttle.c F: include/linux/blk-cgroup.h CONTROL GROUP - CPUSET +M: Waiman Long <longman@redhat.com> M: Zefan Li <lizefan.x@bytedance.com> L: cgroups@vger.kernel.org S: Maintained diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index e4bb5d57f4d1..5f2090d051ac 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6049,6 +6049,9 @@ struct cgroup *cgroup_get_from_id(u64 id) if (!kn) goto out; + if (kernfs_type(kn) != KERNFS_DIR) + goto put; + rcu_read_lock(); cgrp = rcu_dereference(*(void __rcu __force **)&kn->priv); @@ -6056,7 +6059,7 @@ struct cgroup *cgroup_get_from_id(u64 id) cgrp = NULL; rcu_read_unlock(); - +put: kernfs_put(kn); out: return cgrp; |