Skip to content

Commit f717a7e

Browse files
sched/fair: Fix potential memory corruption in child_cfs_rq_on_list
jira VULN-55795 cve CVE-2025-21919 commit-author Zecheng Li <[email protected]> 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 <[email protected]> Reviewed-and-tested-by: K Prateek Nayak <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Vincent Guittot <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit 3b4035d) Signed-off-by: Pratham Patel <[email protected]>
1 parent 8a31569 commit f717a7e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

kernel/sched/fair.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3309,15 +3309,17 @@ static inline bool child_cfs_rq_on_list(struct cfs_rq *cfs_rq)
33093309
{
33103310
struct cfs_rq *prev_cfs_rq;
33113311
struct list_head *prev;
3312+
struct rq *rq = rq_of(cfs_rq);
33123313

33133314
if (cfs_rq->on_list) {
33143315
prev = cfs_rq->leaf_cfs_rq_list.prev;
33153316
} else {
3316-
struct rq *rq = rq_of(cfs_rq);
3317-
33183317
prev = rq->tmp_alone_branch;
33193318
}
33203319

3320+
if (prev == &rq->leaf_cfs_rq_list)
3321+
return false;
3322+
33213323
prev_cfs_rq = container_of(prev, struct cfs_rq, leaf_cfs_rq_list);
33223324

33233325
return (prev_cfs_rq->tg->parent == cfs_rq->tg);

0 commit comments

Comments
 (0)