| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2019-02-27 08:10:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 13:48:22 (GMT) |
| commit | c58f0e847bdca07ec4f0fe33ea1d61394d522f42 (patch) | |
| tree | 40bb98c37aec8cd27b9098eebf6775b881680d81 | |
| parent | 5e4ea98f521605fe55141cf711f769eaddd6511b (diff) | |
| download | common-c58f0e847bdca07ec4f0fe33ea1d61394d522f42.zip common-c58f0e847bdca07ec4f0fe33ea1d61394d522f42.tar.gz common-c58f0e847bdca07ec4f0fe33ea1d61394d522f42.tar.bz2 | |
sched/core: Handle overflow in cpu_shares_write_u64
[ Upstream commit 5b61d50ab4ef590f5e1d4df15cd2cea5f5715308 ]
Bit shift in scale_load() could overflow shares. This patch saturates
it to MAX_SHARES like following sched_group_set_shares().
Example:
# echo 9223372036854776832 > cpu.shares
# cat cpu.shares
Before patch: 1024
After pattch: 262144
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/155125501891.293431.3345233332801109696.stgit@buzz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4617ede..3861dd6 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8512,6 +8512,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset) static int cpu_shares_write_u64(struct cgroup_subsys_state *css, struct cftype *cftype, u64 shareval) { + if (shareval > scale_load_down(ULONG_MAX)) + shareval = MAX_SHARES; return sched_group_set_shares(css_tg(css), scale_load(shareval)); } |