Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfc12eb2 authored by Phil Carmody's avatar Phil Carmody Committed by Ingo Molnar
Browse files

sched: Fix memory leak in two error corner cases 



If the second in each of these pairs of allocations fails, then the
first one will not be freed in the error route out.

Found by a static code analysis tool.

Signed-off-by: default avatarPhil Carmody <ext-phil.2.carmody@nokia.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1260448177-28448-1-git-send-email-ext-phil.2.carmody@nokia.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4ca3ef71

kernel/sched.c

+6 −2
Original line number Diff line number Diff line
@@ -9855,13 +9855,15 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) 
		se = kzalloc_node(sizeof(struct sched_entity),

				  GFP_KERNEL, cpu_to_node(i));

		if (!se)

			goto err;

			goto err_free_rq;



		init_tg_cfs_entry(tg, cfs_rq, se, i, 0, parent->se[i]);

	}



	return 1;



 err_free_rq:

	kfree(cfs_rq);

 err:

	return 0;

}
@@ -9943,13 +9945,15 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent) 
		rt_se = kzalloc_node(sizeof(struct sched_rt_entity),

				     GFP_KERNEL, cpu_to_node(i));

		if (!rt_se)

			goto err;

			goto err_free_rq;



		init_tg_rt_entry(tg, rt_rq, rt_se, i, 0, parent->rt_se[i]);

	}



	return 1;



 err_free_rq:

	kfree(rt_rq);

 err:

	return 0;

}