[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-9e0e83a1eca66f8369e5a02973f85aad65c32416@git.kernel.org>
Date: Wed, 6 Jan 2016 10:47:30 -0800
From: tip-bot for Andrey Ryabinin <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: aryabinin@...tuozzo.com, tglx@...utronix.de, mingo@...nel.org,
torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org,
hpa@...or.com, peterz@...radead.org
Subject: [tip:sched/core] sched/fair:
Fix multiplication overflow on 32-bit systems
Commit-ID: 9e0e83a1eca66f8369e5a02973f85aad65c32416
Gitweb: http://git.kernel.org/tip/9e0e83a1eca66f8369e5a02973f85aad65c32416
Author: Andrey Ryabinin <aryabinin@...tuozzo.com>
AuthorDate: Mon, 14 Dec 2015 15:47:23 +0300
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 6 Jan 2016 11:01:05 +0100
sched/fair: Fix multiplication overflow on 32-bit systems
Make 'r' 64-bit type to avoid overflow in 'r * LOAD_AVG_MAX'
on 32-bit systems:
UBSAN: Undefined behaviour in kernel/sched/fair.c:2785:18
signed integer overflow:
87950 * 47742 cannot be represented in type 'int'
The most likely effect of this bug are bad load average numbers
resulting in weird scheduling. It's also likely that this can
persist for a longer time - until the system goes idle for
a long time so that all load avg numbers get reset.
[ This is the CFS load average metric, not the procfs output, which
is separate. ]
Signed-off-by: Andrey Ryabinin <aryabinin@...tuozzo.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Fixes: 9d89c257dfb9 ("sched/fair: Rewrite runnable load and utilization average tracking")
Link: http://lkml.kernel.org/r/1450097243-30137-1-git-send-email-aryabinin@virtuozzo.com
[ Improved the changelog. ]
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/sched/fair.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 90e26b1..cfdc0e6 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2689,7 +2689,7 @@ static inline int update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
int decayed, removed = 0;
if (atomic_long_read(&cfs_rq->removed_load_avg)) {
- long r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
+ s64 r = atomic_long_xchg(&cfs_rq->removed_load_avg, 0);
sa->load_avg = max_t(long, sa->load_avg - r, 0);
sa->load_sum = max_t(s64, sa->load_sum - r * LOAD_AVG_MAX, 0);
removed = 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists