Skip to content

Commit 95925e7

Browse files
committed
sched/fair: Fix potential memory corruption in child_cfs_rq_on_list
jira LE-3428 cve CVE-2025-21919 Rebuild_History Non-Buildable kernel-5.14.0-570.23.1.el9_6 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: Jonathan Maple <[email protected]>
1 parent f4ff959 commit 95925e7

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
@@ -3708,15 +3708,17 @@ static inline bool child_cfs_rq_on_list(struct cfs_rq *cfs_rq)
37083708
{
37093709
struct cfs_rq *prev_cfs_rq;
37103710
struct list_head *prev;
3711+
struct rq *rq = rq_of(cfs_rq);
37113712

37123713
if (cfs_rq->on_list) {
37133714
prev = cfs_rq->leaf_cfs_rq_list.prev;
37143715
} else {
3715-
struct rq *rq = rq_of(cfs_rq);
3716-
37173716
prev = rq->tmp_alone_branch;
37183717
}
37193718

3719+
if (prev == &rq->leaf_cfs_rq_list)
3720+
return false;
3721+
37203722
prev_cfs_rq = container_of(prev, struct cfs_rq, leaf_cfs_rq_list);
37213723

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

0 commit comments

Comments
 (0)