blk-mq: Fix missed srcu_barrier() calls before cleanup_srcu_struct()
PATCH 1/1 blk-mq: Fix missed srcu_barrier() calls before cleanup_srcu_struct()
In blk_mq_alloc_tag_set(), if blk_mq_alloc_set_map_and_rqs() fails after some hardware queues have already been allocated, its unwind path frees the partially allocated maps and tags through invoke the blk_mq_free_map_and_rqs()->blk_mq_free_tags(), which issues call_srcu() against set->tags_srcu. control then returns to blk_mq_alloc_tag_set() and falls through to the out_cleanup_tags_srcu label, which calls cleanup_srcu_struct() directly.
Calling cleanup_srcu_struct() while call_srcu() callbacks are still outstanding is illegal, it triggers a WARN and tears down the srcu_struct while the pending blk_mq_free_tags_callback() still references it, leading to a use-after-free.
The normal teardown path in blk_mq_free_tag_set() already guards against this by calling srcu_barrier() before cleanup_srcu_struct(), but the error path in blk_mq_alloc_tag_set() was missing the same barrier. this commit therefore also add srcu_barrier(&set->tags_srcu) call so that all outstanding SRCU callbacks complete before the srcu_struct is destroyed.
--- block/blk-mq.c | 1 + 1 file changed, 1 insertion(+)
block/blk-mq.c +1 -0
@@ -4924,6 +4924,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) }kfree (set->tags); set->tags =NULL ; +srcu_barrier (&set->tags_srcu); out_cleanup_tags_srcu:cleanup_srcu_struct (&set->tags_srcu); out_cleanup_srcu:
Signature · 1 line
2.17.1
Friendly ping :)
Thanks
Zqiang
Quoted 42 lines
In
blk_mq_alloc_tag_set(), ifblk_mq_alloc_set_map_and_rqs()fails after some hardware queues have already been allocated, its unwind path frees the partially allocated maps and tags through invoke the blk_mq_free_map_and_rqs()->blk_mq_free_tags(), which issuescall_srcu()againstset->tags_srcu. control then returns toblk_mq_alloc_tag_set()and falls through to theout_cleanup_tags_srculabel, which callscleanup_srcu_struct()directly.Calling
cleanup_srcu_struct()whilecall_srcu()callbacks are still outstanding is illegal, it triggers a WARN and tears down thesrcu_structwhile the pendingblk_mq_free_tags_callback()still references it, leading to a use-after-free.The normal teardown path in
blk_mq_free_tag_set()already guards against this by callingsrcu_barrier()beforecleanup_srcu_struct(), but the error path inblk_mq_alloc_tag_set()was missing the same barrier. this commit therefore also addsrcu_barrier(&set->tags_srcu)call so that all outstanding SRCU callbacks complete before thesrcu_structis destroyed.Fixes ad0d05dbddc1 ("blk-mq: Defer freeing of tags page_list to SRCU callback")Signed-off-by Zqiang <[email protected]>--- block/blk-mq.c | 1 + 1 file changed, 1 insertion(+)block/blk-mq.c +1
-0@@ -4924,6 +4924,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) }kfree (set->tags); set->tags =NULL ; +srcu_barrier (&set->tags_srcu); out_cleanup_tags_srcu:cleanup_srcu_struct (&set->tags_srcu); out_cleanup_srcu:Signature · 1 line
2.17.1