Skip to content

Commit 2722f9d

Browse files
JinXiao-Intelbalsini
authored andcommitted
block: blk_init_allocated_queue() set q->fq as NULL in the fail case
commit 54648cf upstream. 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 7c94e1c ("block: introduce blk_flush_queue to drive flush machinery") Cc: <stable@vger.kernel.org> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com> Signed-off-by: xiao jin <jin.xiao@intel.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Alessio Balsini <balsini@android.com>
1 parent 9ae2dad commit 2722f9d

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

block/blk-core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
747747

748748
fail:
749749
blk_free_flush_queue(q->fq);
750+
q->fq = NULL;
750751
return NULL;
751752
}
752753
EXPORT_SYMBOL(blk_init_allocated_queue);

0 commit comments

Comments
 (0)