hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I9QJ1S CVE: NA ---------------------------------------- Commit 99d055b4fd4b ("block: remove per-disk debugfs files in blk_unregister_queue") move blk_trace_shutdown() from blk_release_queue() to blk_unregister_queue(). However, blktrace can still be enabled through ioctl after blk_unregister_queue(), and blktrace will be leaked in this case. Fix the problem by calling blk_trace_shutdown() in blk_release_queue(). Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- block/blk-sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 0bbd6bec1b3e..f4e33203a8ee 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -863,6 +863,10 @@ static void blk_release_queue(struct kobject *kobj) if (queue_is_mq(q)) blk_mq_release(q); + mutex_lock(&q->debugfs_mutex); + blk_trace_shutdown(q); + mutex_unlock(&q->debugfs_mutex); + bioset_exit(&q->bio_split); ida_simple_remove(&blk_queue_ida, q->id); -- 2.39.2