Skip to content

Commit 3b4035d

Browse files
Zecheng LiPeter Zijlstra
authored andcommitted
sched/fair: Fix potential memory corruption in child_cfs_rq_on_list
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]
1 parent 7eb1721 commit 3b4035d

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
@@ -4045,15 +4045,17 @@ static inline bool child_cfs_rq_on_list(struct cfs_rq *cfs_rq)
40454045
{
40464046
struct cfs_rq *prev_cfs_rq;
40474047
struct list_head *prev;
4048+
struct rq *rq = rq_of(cfs_rq);
40484049

40494050
if (cfs_rq->on_list) {
40504051
prev = cfs_rq->leaf_cfs_rq_list.prev;
40514052
} else {
4052-
struct rq *rq = rq_of(cfs_rq);
4053-
40544053
prev = rq->tmp_alone_branch;
40554054
}
40564055

4056+
if (prev == &rq->leaf_cfs_rq_list)
4057+
return false;
4058+
40574059
prev_cfs_rq = container_of(prev, struct cfs_rq, leaf_cfs_rq_list);
40584060

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

0 commit comments

Comments
 (0)