Commit 54648cf1 authored by xiao jin's avatar xiao jin Committed by Jens Axboe

block: blk_init_allocated_queue() set q->fq as NULL in the fail case

We find the memory use-after-free issue in __blk_drain_queue()
on the kernel 4.14. After read the latest kernel 4.18-rc6 we
think it has the same problem.

Memory is allocated for q->fq in the blk_init_allocated_queue().
If the elevator init function called with error return, it will
run into the fail case to free the q->fq.

Then the __blk_drain_queue() uses the same memory after the free
of the q->fq, it will lead to the unpredictable event.

The patch is to set q->fq as NULL in the fail case of
blk_init_allocated_queue().

Fixes: commit 7c94e1c1 ("block: introduce blk_flush_queue to drive flush machinery")
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarxiao jin <jin.xiao@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f7f1fc36
...@@ -1184,6 +1184,7 @@ int blk_init_allocated_queue(struct request_queue *q) ...@@ -1184,6 +1184,7 @@ int blk_init_allocated_queue(struct request_queue *q)
q->exit_rq_fn(q, q->fq->flush_rq); q->exit_rq_fn(q, q->fq->flush_rq);
out_free_flush_queue: out_free_flush_queue:
blk_free_flush_queue(q->fq); blk_free_flush_queue(q->fq);
q->fq = NULL;
return -ENOMEM; return -ENOMEM;
} }
EXPORT_SYMBOL(blk_init_allocated_queue); EXPORT_SYMBOL(blk_init_allocated_queue);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment