aboutsummaryrefslogtreecommitdiffstats
diff options
authorTejun Heo <tj@kernel.org>2026-05-29 08:25:48 -1000
committerTejun Heo <tj@kernel.org>2026-05-29 08:25:48 -1000
commitebc50c66b365d3046c7741195224d2aa7809c9b5 (patch)
tree94743741beb19a3c0abb39d54c8c38e2ee4b93fb
parentf977fabf943f8b2a0c501b6457d0b4cc239922fa (diff)
parent390f2d73bc99a888469f789f274c162da33bafe5 (diff)
downloadlinux-next-history-ebc50c66b365d3046c7741195224d2aa7809c9b5.tar.gz
Merge branch 'for-7.2' into for-next
-rw-r--r--kernel/cgroup/cpuset.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 6bdb68689c245..591e3aa487fc1 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1004,8 +1004,11 @@ void rebuild_sched_domains_locked(void)
* prevent the panic.
*/
for (i = 0; doms && i < ndoms; i++) {
- if (WARN_ON_ONCE(!cpumask_subset(doms[i], cpu_active_mask)))
+ if (WARN_ON_ONCE(!cpumask_subset(doms[i], cpu_active_mask))) {
+ free_sched_domains(doms, ndoms);
+ kfree(attr);
return;
+ }
}
/* Have scheduler rebuild the domains */