Commit 3104bf03 authored Jun 16, 2009 by Christian Engelmayer Committed by Ingo Molnar Jun 17, 2009

sched: Fix out of scope variable access in sched_slice()



Access to local variable lw is aliased by usage of pointer load.
Access to pointer load in calc_delta_mine() happens when lw is
already out of scope.

[ Reported by static code analysis. ]

Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com>
LKML-Reference: <20090616103512.0c846e51@frequentis.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 348ec61e

kernel/sched_fair.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -430,12 +430,13 @@ static u64 sched_slice(struct cfs_rq cfs_rq, struct sched_entity se)

		for_each_sched_entity(se) {
		struct load_weight *load;
		struct load_weight lw;

		cfs_rq = cfs_rq_of(se);
		load = &cfs_rq->load;

		if (unlikely(!se->on_rq)) {
		struct load_weight lw = cfs_rq->load;
		lw = cfs_rq->load;

		update_load_add(&lw, se->load.weight);
		load = &lw;