[PATCH 1/2] cgroup-v1: Fix missing mutex_unlock in error paths
From: Zijiang Huang
Date: Fri Jul 18 2025 - 07:55:27 EST
In the function, after acquiring the mutex with mutex_lock, multiple return
paths (such as returning ERR_PTR, NULL, or normal pointers)fail to call
mutex_unlock to release the lock, which could lead to deadlock risks.
Signed-off-by: Zijiang Huang <kerayhuang@xxxxxxxxxxx>
Reviewed-by: Hao Peng <flyingpeng@xxxxxxxxxxx>
---
kernel/cgroup/cgroup-v1.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index fa24c032ed6f..73e0fd93111a 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -423,8 +423,10 @@ static void *cgroup_pidlist_start(struct seq_file *s, loff_t *pos)
*/
if (!ctx->procs1.pidlist) {
ret = pidlist_array_load(cgrp, type, &ctx->procs1.pidlist);
- if (ret)
+ if (ret) {
+ mutex_unlock(&cgrp->pidlist_mutex);
return ERR_PTR(ret);
+ }
}
l = ctx->procs1.pidlist;
@@ -443,11 +445,14 @@ static void *cgroup_pidlist_start(struct seq_file *s, loff_t *pos)
}
}
/* If we're off the end of the array, we're done */
- if (index >= l->length)
+ if (index >= l->length) {
+ mutex_unlock(&cgrp->pidlist_mutex);
return NULL;
+ }
/* Update the abstract position to be the actual pid that we found */
iter = l->list + index;
*pos = *iter;
+ mutex_unlock(&cgrp->pidlist_mutex);
return iter;
}
--
2.43.5