This is a note to let you know that I've just added the patch titled
cgroup/cpuset: Fix a memory leak in update_exclusive_cpumask()
to the 6.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cgroup-cpuset-fix-a-memory-leak-in-update_exclusive_cpumask.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 66f40b926dd249f74334a22162c09e7ec1ec5b07 Mon Sep 17 00:00:00 2001
From: Waiman Long <longman@xxxxxxxxxx>
Date: Tue, 27 Feb 2024 19:58:01 -0500
Subject: cgroup/cpuset: Fix a memory leak in update_exclusive_cpumask()
From: Waiman Long <longman@xxxxxxxxxx>
commit 66f40b926dd249f74334a22162c09e7ec1ec5b07 upstream.
Fix a possible memory leak in update_exclusive_cpumask() by moving the
alloc_cpumasks() down after the validate_change() check which can fail
and still before the temporary cpumasks are needed.
Fixes: e2ffe502ba45 ("cgroup/cpuset: Add cpuset.cpus.exclusive for v2")
Reported-and-tested-by: Mirsad Todorovac <mirsad.todorovac@xxxxxx>
Closes: https://lore.kernel.org/lkml/14915689-27a3-4cd8-80d2-9c30d0c768b6@xxxxxxxxxxxx
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v6.7+
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/cgroup/cpuset.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -2502,9 +2502,6 @@ static int update_exclusive_cpumask(stru
if (cpumask_equal(cs->exclusive_cpus, trialcs->exclusive_cpus))
return 0;
- if (alloc_cpumasks(NULL, &tmp))
- return -ENOMEM;
-
if (*buf)
compute_effective_exclusive_cpumask(trialcs, NULL);
@@ -2519,6 +2516,9 @@ static int update_exclusive_cpumask(stru
if (retval)
return retval;
+ if (alloc_cpumasks(NULL, &tmp))
+ return -ENOMEM;
+
if (old_prs) {
if (cpumask_empty(trialcs->effective_xcpus)) {
invalidate = true;
Patches currently in stable-queue which might be from longman@xxxxxxxxxx are
queue-6.7/cgroup-cpuset-fix-retval-in-update_cpumask.patch
queue-6.7/cgroup-cpuset-fix-a-memory-leak-in-update_exclusive_cpumask.patch
