kevin/linux
1
Fork 0
Code

cgroup/pids: Remove unreachable paths of pids_{can,cancel}_fork

Browse Source 
According to the implementation of cgroup_css_set_fork(), it will fail
if cset cannot be found and the can_fork/cancel_fork methods will not
be called in this case, which means that the argument 'cset' for these
methods must not be NULL, so remove the unrechable paths in them.

Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: Waiman Long <longman@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Xiu Jianfeng 2024-08-05 00:43:04 +00:00 committed by Tejun Heo
parent 563ea1f5f8
commit 4980f71202
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/cgroup/pids.c
View File

@ -272,15 +272,10 @@ static void pids_event(struct pids_cgroup *pids_forking,
*/ */
static int pids_can_fork(struct task_struct *task, struct css_set *cset) static int pids_can_fork(struct task_struct *task, struct css_set *cset)
{ {
struct cgroup_subsys_state *css;
struct pids_cgroup *pids, *pids_over_limit; struct pids_cgroup *pids, *pids_over_limit;
int err; int err;
if (cset) pids = css_pids(cset->subsys[pids_cgrp_id]);
css = cset->subsys[pids_cgrp_id];
else
css = task_css_check(current, pids_cgrp_id, true);
pids = css_pids(css);
err = pids_try_charge(pids, 1, &pids_over_limit); err = pids_try_charge(pids, 1, &pids_over_limit);
if (err) if (err)
pids_event(pids, pids_over_limit); pids_event(pids, pids_over_limit);
@ -290,14 +285,9 @@ static int pids_can_fork(struct task_struct *task, struct css_set *cset)
static void pids_cancel_fork(struct task_struct *task, struct css_set *cset) static void pids_cancel_fork(struct task_struct *task, struct css_set *cset)
{ {
struct cgroup_subsys_state *css;
struct pids_cgroup *pids; struct pids_cgroup *pids;
if (cset) pids = css_pids(cset->subsys[pids_cgrp_id]);
css = cset->subsys[pids_cgrp_id];
else
css = task_css_check(current, pids_cgrp_id, true);
pids = css_pids(css);
pids_uncharge(pids, 1); pids_uncharge(pids, 1);
} }