sched: fix potential use-after-free with cfs bandwidth
Subsystems (2)
PATCH v2 1/1 sched: fix potential use-after-free with cfs bandwidth
We remove the cfs_rq throttled_csd_list entry *before* doing the unthrottle. The problem with that is that destroy_cfs_bandwidth() does a lockless scan of the system for any non-empty CSD lists. As a result, it is possible that destroy_cfs_bandwidth() returns while we still have a cfs_rq from the task group about to be unthrottled.
For full correctness, we should avoid removal from the list until after we're done unthrottling in __cfsb_csd_unthrottle().
For consistency, we make the same change to distribute_cfs_runtime(), even though this should already be safe due to destroy_cfs_bandwidth() cancelling the bandwidth hrtimers.
---
v2: updated commit message with additional metadata
kernel/sched/fair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/sched/fair.c +4 -4
@@ -5917,10 +5917,10 @@ static void __cfsb_csd_unthrottle(void *arg)list_for_each_entry_safe (cursor, tmp, &rq->cfsb_csd_list, throttled_csd_list) { -list_del_init (&cursor->throttled_csd_list); -if (cfs_rq_throttled (cursor))unthrottle_cfs_rq (cursor); + +list_del_init (&cursor->throttled_csd_list); }rcu_read_unlock ();
@@ -6034,11 +6034,11 @@ static bool distribute_cfs_runtime(struct cfs_bandwidth *cfs_b)rq_lock_irqsave (rq, &rf); -list_del_init (&cfs_rq->throttled_csd_list); -if (cfs_rq_throttled (cfs_rq))unthrottle_cfs_rq (cfs_rq); +list_del_init (&cfs_rq->throttled_csd_list); +rq_unlock_irqrestore (rq, &rf); }SCHED_WARN_ON (!list_empty (&local_unthrottle));
Signature · 1 line
2.48.1.658.g4767266eb4-goog
…
Quoted 2 lines
For full correctness, we should avoid removal from the list until after we're done unthrottling in
__cfsb_csd_unthrottle().
…
…
Quoted 1 line
Reviewed-and-tested-by K Prateek Nayak <[email protected]>
…
Is such a tag really supported?
Regards,
Markus
Markus, it was good to ask for a Fixes tag but now you're just distracting people who are doing actual work.
https://lore.kernel.org/all/[email protected]/
regards,
dan carpenter
Quoted 2 lines
Markus, it was good to ask for a Fixes tag but now you're just distracting people who are doing actual work.
Will any contributors add also a “stable tag”?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v6.14-rc3#n3
Regards,
Markus
Quoted 6 lines · Markus Elfring
Quoted 2 lines
Markus, it was good to ask for a Fixes tag but now you're just distracting people who are doing actual work.
Will any contributors add also a “stable tag”?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v6.14-rc3#n3
Sure, it wouldn't hurt to add a stable tag. In real life terms the stable scripts are going to pick this one up automatically because it has "use-after-free" in the subject.
regards,
dan carpenter