linux-kernel - [PATCH] sched: Fix out-of-bound access in uclamp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20210428172722.3908735-1-qperret@google.com>
Date:   Wed, 28 Apr 2021 17:27:22 +0000
From:   Quentin Perret <qperret@...gle.com>
To:     mingo@...hat.com, peterz@...radead.org, vincent.guittot@...aro.org,
        juri.lelli@...hat.com
Cc:     dietmar.eggemann@....com, rostedt@...dmis.org, bsegall@...gle.com,
        mgorman@...e.de, bristot@...hat.com, qais.yousef@....com,
        kernel-team@...roid.com, linux-kernel@...r.kernel.org,
        patrick.bellasi@...bug.net
Subject: [PATCH] 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.2,
rounded to the closest value: 51. Now, a task with a clamp of 1024 (as
is the default for the min clamp of RT tasks) will be mapped to bucket
id 1024/51=20 as we're now using a standard integer division. Sadly,
correct indexes are in range [0,19], hence leading to an out of bound
memory access.

Fix this by using a rounding-up division when computing the bucket size.

Fixes: 69842cba9ace ("sched/uclamp: Add CPU's clamp buckets refcounting")
Suggested-by: Qais Yousef <qais.yousef@....com>
Signed-off-by: Quentin Perret <qperret@...gle.com>

---

This was found thanks to the SCHED_WARN_ON() in uclamp_rq_dec_id() which
indicated a broken state while running with 20 buckets on Android.

Big thanks to Qais for the help with this one.
---
 kernel/sched/core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 98191218d891..ec175909e8b0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -920,8 +920,7 @@ static struct uclamp_se uclamp_default[UCLAMP_CNT];
  */
 DEFINE_STATIC_KEY_FALSE(sched_uclamp_used);

-/* Integer rounded range for each bucket */
-#define UCLAMP_BUCKET_DELTA DIV_ROUND_CLOSEST(SCHED_CAPACITY_SCALE, UCLAMP_BUCKETS)
+#define UCLAMP_BUCKET_DELTA DIV_ROUND_UP(SCHED_CAPACITY_SCALE, UCLAMP_BUCKETS)

 #define for_each_clamp_id(clamp_id) \
 	for ((clamp_id) = 0; (clamp_id) < UCLAMP_CNT; (clamp_id)++)
-- 
2.31.1.498.g6c1eba8ee3d-goog