]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
blk-throttle: fix throtl_data leak during disk release
authorYu Kuai <yukuai3@huawei.com>
Wed, 17 Sep 2025 07:55:39 +0000 (15:55 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 17 Sep 2025 13:27:29 +0000 (07:27 -0600)
commit336aec7b06be860477be80a4299263a2e9355789
tree2647992acf8f1f2e6a6e581caef14ab6c2012b71
parent0b507305a08c134722f363de6fe6f1ba84e313b7
blk-throttle: fix throtl_data leak during disk release

Tightening the throttle activation check in blk_throtl_activated() to
require both q->td presence and policy bit set introduced a memory leak
during disk release:

blkg_destroy_all() clears the policy bit first during queue deactivation,
causing subsequent blk_throtl_exit() to skip throtl_data cleanup when
blk_throtl_activated() fails policy check.

Idealy we should avoid modifying blk_throtl_exit() activation check because
it's intuitive that blk-throtl start from blk_throtl_init() and end in
blk_throtl_exit(). However, call blk_throtl_exit() before
blkg_destroy_all() will make a long term deadlock problem easier to
trigger[1], hence fix this problem by checking if q->td is NULL from
blk_throtl_exit(), and remove policy deactivation as well since it's
useless.

[1] https://lore.kernel.org/all/CAHj4cs9p9H5yx+ywsb3CMUdbqGPhM+8tuBvhW=9ADiCjAqza9w@mail.gmail.com/#t

Fixes: bd9fd5be6bc0 ("blk-throttle: fix access race during throttle policy activation")
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Closes: https://lore.kernel.org/all/CAHj4cs-p-ZwBEKigBj7T6hQCOo-H68-kVwCrV6ZvRovrr9Z+HA@mail.gmail.com/
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-throttle.c