Skip to contentSkip to conversation

sched: fair: avoid integer overflow

PATCH In review Michal Nazarewicz 3 participants 3 messages Nov 10, 2013 – Nov 13, 2013 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched: fair: avoid integer overflow

From: Michal Nazarewicz <[email protected]>

sa->runnable_avg_sum is of type u32 but after shifting it by NICE_0_SHIFT bits it is promoted to u64. This of course makes no sense, since the result will never be more then 32-bit long. Casting sa->runnable_avg_sum to u64 before it is shifted, fixes this problem.

---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
index df77c60..50f1e170 100644
@@ -2153,7 +2153,7 @@ static inline void __update_tg_runnable_avg(struct sched_avg *sa,
 	long contrib;
 
 	/* The fraction of a cpu used by this cfs_rq */
-	contrib = div_u64(sa->runnable_avg_sum << NICE_0_SHIFT,
+	contrib = div_u64((u64)sa->runnable_avg_sum << NICE_0_SHIFT,
 			  sa->runnable_avg_period + 1);
 	contrib -= cfs_rq->tg_runnable_contrib;
 
Signature · 1 line
1.8.3.2
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Michal Nazarewicz

From: Michal Nazarewicz <[email protected]>

sa->runnable_avg_sum is of type u32 but after shifting it by NICE_0_SHIFT bits it is promoted to u64. This of course makes no sense, since the result will never be more then 32-bit long. Casting sa->runnable_avg_sum to u64 before it is shifted, fixes this problem.

Quoted 16 lines
---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
index df77c60..50f1e170 100644
@@ -2153,7 +2153,7 @@ static inline void __update_tg_runnable_avg(struct sched_avg *sa,
 	long contrib;
 
 	/* The fraction of a cpu used by this cfs_rq */
-	contrib = div_u64(sa->runnable_avg_sum << NICE_0_SHIFT,
+	contrib = div_u64((u64)sa->runnable_avg_sum << NICE_0_SHIFT,
 			  sa->runnable_avg_period + 1);
 	contrib -= cfs_rq->tg_runnable_contrib;
#2 lore raw

[tip:sched/urgent] sched/fair: Avoid integer overflow

In reply to Michal Nazarewicz
sched/fair: Avoid integer overflow
Commit-ID:  85b088e934b9943322bfe37077289ae60f1b3414
Gitweb:     http://git.kernel.org/tip/85b088e934b9943322bfe37077289ae60f1b3414
Author:     Michal Nazarewicz <[email protected]>
AuthorDate: Sun, 10 Nov 2013 20:42:01 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 13 Nov 2013 13:33:55 +0100

sched/fair: Avoid integer overflow

sa->runnable_avg_sum is of type u32 but after shifting it by NICE_0_SHIFT bits it is promoted to u64. This of course makes no sense, since the result will never be more then 32-bit long. Casting sa->runnable_avg_sum to u64 before it is shifted, fixes this problem.

---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
index 201be78..e8b652e 100644
@@ -2178,7 +2178,7 @@ static inline void __update_tg_runnable_avg(struct sched_avg *sa,
 	long contrib;
 
 	/* The fraction of a cpu used by this cfs_rq */
-	contrib = div_u64(sa->runnable_avg_sum << NICE_0_SHIFT,
+	contrib = div_u64((u64)sa->runnable_avg_sum << NICE_0_SHIFT,
 			  sa->runnable_avg_period + 1);
 	contrib -= cfs_rq->tg_runnable_contrib;