From: Zijiang Huang <huangzjsmile@gmail.com>
To: tj@kernel.org, hannes@cmpxchg.org, mkoutny@suse.com
Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
Zijiang Huang <kerayhuang@tencent.com>,
Hao Peng <flyingpeng@tencent.com>
Subject: [PATCH 1/2] cgroup-v1: Fix missing mutex_unlock in error paths
Date: Fri, 18 Jul 2025 19:54:08 +0800 [thread overview]
Message-ID: <20250718115409.878122-1-kerayhuang@tencent.com> (raw)
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@tencent.com>
Reviewed-by: Hao Peng <flyingpeng@tencent.com>
---
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
next reply other threads:[~2025-07-18 11:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-18 11:54 Zijiang Huang [this message]
2025-07-18 11:54 ` [PATCH 2/2] cgroup: Fix reference count leak when cft->open is NULL Zijiang Huang
2025-07-18 12:48 ` Markus Elfring
2025-07-18 12:55 ` Michal Koutný
2025-07-18 12:23 ` [PATCH 1/2] cgroup-v1: Fix missing mutex_unlock in error paths Markus Elfring
2025-07-18 12:55 ` Michal Koutný
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250718115409.878122-1-kerayhuang@tencent.com \
--to=huangzjsmile@gmail.com \
--cc=cgroups@vger.kernel.org \
--cc=flyingpeng@tencent.com \
--cc=hannes@cmpxchg.org \
--cc=kerayhuang@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mkoutny@suse.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).