Commit 5847c977 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cgroup-for-6.8-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fixes from Tejun Heo:
 "Two cpuset fixes. Both are for bugs in error handling paths and low
  risk"

* tag 'cgroup-for-6.8-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup/cpuset: Fix retval in update_cpumask()
  cgroup/cpuset: Fix a memory leak in update_exclusive_cpumask()
parents 29cd507c 25125a47

kernel/cgroup/cpuset.c

+4 −4
Original line number Diff line number Diff line
@@ -2562,7 +2562,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs, 
		update_partition_sd_lb(cs, old_prs);

out_free:

	free_cpumasks(NULL, &tmp);

	return 0;

	return retval;

}



/**
@@ -2598,9 +2598,6 @@ static int update_exclusive_cpumask(struct cpuset *cs, struct cpuset *trialcs, 
	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);
@@ -2615,6 +2612,9 @@ static int update_exclusive_cpumask(struct cpuset *cs, struct cpuset *trialcs, 
	if (retval)

		return retval;



	if (alloc_cpumasks(NULL, &tmp))

		return -ENOMEM;



	if (old_prs) {

		if (cpumask_empty(trialcs->effective_xcpus)) {

			invalidate = true;