Skip to content

Commit 6d2f890

Browse files
Quentin PerretPeter Zijlstra
authored andcommitted
sched: Fix out-of-bound access in uclamp
Util-clamp places tasks in different buckets based on their clamp values for performance reasons. However, the size of buckets is currently computed using a rounding division, which can lead to an off-by-one error in some configurations. For instance, with 20 buckets, the bucket size will be 1024/20=51. A task with a clamp of 1024 will be mapped to bucket id 1024/51=20. Sadly, correct indexes are in range [0,19], hence leading to an out of bound memory access. Clamp the bucket id to fix the issue. Fixes: 69842cb ("sched/uclamp: Add CPU's clamp buckets refcounting") Suggested-by: Qais Yousef <qais.yousef@arm.com> Signed-off-by: Quentin Perret <qperret@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Reviewed-by: Dietmar Eggemann <dietmar.eggemann@arm.com> Link: https://lkml.kernel.org/r/20210430151412.160913-1-qperret@google.com
1 parent d583d36 commit 6d2f890

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/sched/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ DEFINE_STATIC_KEY_FALSE(sched_uclamp_used);
938938

939939
static inline unsigned int uclamp_bucket_id(unsigned int clamp_value)
940940
{
941-
return clamp_value / UCLAMP_BUCKET_DELTA;
941+
return min_t(unsigned int, clamp_value / UCLAMP_BUCKET_DELTA, UCLAMP_BUCKETS - 1);
942942
}
943943

944944
static inline unsigned int uclamp_none(enum uclamp_id clamp_id)

0 commit comments

Comments
 (0)