Skip to content

Commit f42d79a

Browse files
nomuranecaxboe
authored andcommitted
blk-mq: fix use-after-free in blk_mq_free_tag_set()
tags is freed in blk_mq_free_rq_map() and should not be used after that. The problem doesn't manifest if CONFIG_CPUMASK_OFFSTACK is false because free_cpumask_var() is nop. tags->cpumask is allocated in blk_mq_init_tags() so it's natural to free cpumask in its counter part, blk_mq_free_tags(). Fixes: f26cdc8 ("blk-mq: Shared tag enhancements") Signed-off-by: Jun'ichi Nomura <[email protected]> Cc: Keith Busch <[email protected]> Reviewed-by: Jeff Moyer <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 835da3f commit f42d79a

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

block/blk-mq-tag.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,7 @@ void blk_mq_free_tags(struct blk_mq_tags *tags)
641641
{
642642
bt_free(&tags->bitmap_tags);
643643
bt_free(&tags->breserved_tags);
644+
free_cpumask_var(tags->cpumask);
644645
kfree(tags);
645646
}
646647

block/blk-mq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2296,10 +2296,8 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)
22962296
int i;
22972297

22982298
for (i = 0; i < set->nr_hw_queues; i++) {
2299-
if (set->tags[i]) {
2299+
if (set->tags[i])
23002300
blk_mq_free_rq_map(set, set->tags[i], i);
2301-
free_cpumask_var(set->tags[i]->cpumask);
2302-
}
23032301
}
23042302

23052303
kfree(set->tags);

0 commit comments

Comments
 (0)