tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 1772094f aae8dda5

+5 -1
+1
MAINTAINERS
··· 5246 5246 F: include/linux/blk-cgroup.h 5247 5247 5248 5248 CONTROL GROUP - CPUSET 5249 + M: Waiman Long <longman@redhat.com> 5249 5250 M: Zefan Li <lizefan.x@bytedance.com> 5250 5251 L: cgroups@vger.kernel.org 5251 5252 S: Maintained
+4 -1
kernel/cgroup/cgroup.c
··· 6049 6049 if (!kn) 6050 6050 goto out; 6051 6051 6052 + if (kernfs_type(kn) != KERNFS_DIR) 6053 + goto put; 6054 + 6052 6055 rcu_read_lock(); 6053 6056 6054 6057 cgrp = rcu_dereference(*(void __rcu __force **)&kn->priv); ··· 6059 6056 cgrp = NULL; 6060 6057 6061 6058 rcu_read_unlock(); 6062 - 6059 + put: 6063 6060 kernfs_put(kn); 6064 6061 out: 6065 6062 return cgrp;