Commit 4065643
committed
sched/fair: Fix potential memory corruption in child_cfs_rq_on_list
jira VULN-55799
cve CVE-2025-21919
commit-author Zecheng Li <zecheng@google.com>
commit 3b4035d
child_cfs_rq_on_list attempts to convert a 'prev' pointer to a cfs_rq.
This 'prev' pointer can originate from struct rq's leaf_cfs_rq_list,
making the conversion invalid and potentially leading to memory
corruption. Depending on the relative positions of leaf_cfs_rq_list and
the task group (tg) pointer within the struct, this can cause a memory
fault or access garbage data.
The issue arises in list_add_leaf_cfs_rq, where both
cfs_rq->leaf_cfs_rq_list and rq->leaf_cfs_rq_list are added to the same
leaf list. Also, rq->tmp_alone_branch can be set to rq->leaf_cfs_rq_list.
This adds a check `if (prev == &rq->leaf_cfs_rq_list)` after the main
conditional in child_cfs_rq_on_list. This ensures that the container_of
operation will convert a correct cfs_rq struct.
This check is sufficient because only cfs_rqs on the same CPU are added
to the list, so verifying the 'prev' pointer against the current rq's list
head is enough.
Fixes a potential memory corruption issue that due to current struct
layout might not be manifesting as a crash but could lead to unpredictable
behavior when the layout changes.
Fixes: fdaba61 ("sched/fair: Ensure that the CFS parent is added after unthrottling")
Signed-off-by: Zecheng Li <zecheng@google.com>
Reviewed-and-tested-by: K Prateek Nayak <kprateek.nayak@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20250304214031.2882646-1-zecheng@google.com
(cherry picked from commit 3b4035d)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>1 parent de5624a commit 4065643
1 file changed
+4
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3314 | 3314 | | |
3315 | 3315 | | |
3316 | 3316 | | |
| 3317 | + | |
3317 | 3318 | | |
3318 | 3319 | | |
3319 | 3320 | | |
3320 | 3321 | | |
3321 | | - | |
3322 | | - | |
3323 | 3322 | | |
3324 | 3323 | | |
3325 | 3324 | | |
| 3325 | + | |
| 3326 | + | |
| 3327 | + | |
3326 | 3328 | | |
3327 | 3329 | | |
3328 | 3330 | | |
| |||
0 commit comments