summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLi Jinlin <lijinlin3@huawei.com>2021-09-07 15:12:42 +0300
committerJens Axboe <axboe@kernel.dk>2021-09-07 17:36:56 +0300
commit884f0e84f1e3195b801319c8ec3d5774e9bf2710 (patch)
treed41b559ce2e109474d97ac2b8aa5250d0d765f53 /block
parentdfbb3409b27fa42b96f5727a80d3ceb6a8663991 (diff)
downloadlinux-884f0e84f1e3195b801319c8ec3d5774e9bf2710.tar.xz
blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
The pending timer has been set up in blk_throtl_init(). However, the timer is not deleted in blk_throtl_exit(). This means that the timer handler may still be running after freeing the timer, which would result in a use-after-free. Fix by calling del_timer_sync() to delete the timer in blk_throtl_exit(). Signed-off-by: Li Jinlin <lijinlin3@huawei.com> Link: https://lore.kernel.org/r/20210907121242.2885564-1-lijinlin3@huawei.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-throttle.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 55c49015e533..7c4e7993ba97 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2458,6 +2458,7 @@ int blk_throtl_init(struct request_queue *q)
void blk_throtl_exit(struct request_queue *q)
{
BUG_ON(!q->td);
+ del_timer_sync(&q->td->service_queue.pending_timer);
throtl_shutdown_wq(q);
blkcg_deactivate_policy(q, &blkcg_policy_throtl);
free_percpu(q->td->latency_buckets[READ]);