block: blk_init_allocated_queue() set q->fq as NULL in the fail case
PATCH 1/1 block: blk_init_allocated_queue() set q->fq as NULL in the fail case
From: xiao jin <[email protected]>
commit 54648cf1ec2d7f4b6a71767799c45676a138ca24 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().
--- block/blk-core.c | 1 + 1 file changed, 1 insertion(+)
block/blk-core.c +1 -0
@@ -870,6 +870,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, fail:blk_free_flush_queue (q->fq); + q->fq =NULL ;return NULL ; }EXPORT_SYMBOL (blk_init_allocated_queue);
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Greg KH
maintainerQuoted 44 lines · Alessio Balsini
From: xiao jin <[email protected]>
commit
54648cf1ec2d7f4b6a71767799c45676a138ca24upstream.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->fqin theblk_init_allocated_queue(). If the elevator init function called with error return, it will run into the fail case to free theq->fq.Then the
__blk_drain_queue()uses the same memory after the free of theq->fq, it will lead to the unpredictable event.The patch is to set
q->fqas NULL in the fail case ofblk_init_allocated_queue().Fixes commit 7c94e1c157a2 ("block: introduce blk_flush_queue to drive flush machinery")Cc <[email protected]>Reviewed-by Ming Lei <[email protected]>Reviewed-by Bart Van Assche <[email protected]>Signed-off-by xiao jin <[email protected]>Signed-off-by Jens Axboe <[email protected]>Signed-off-by Alessio Balsini <[email protected]>--- block/blk-core.c | 1 + 1 file changed, 1 insertion(+)block/blk-core.c +1
-0@@ -870,6 +870,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, fail:blk_free_flush_queue (q->fq); + q->fq =NULL ;return NULL ; }EXPORT_SYMBOL (blk_init_allocated_queue);Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Guenter sent this backport a day before you did, so I took his version and added your s-o-b to it.
thanks,
greg k-h
Oops, thanks!
Quoted 53 lines · Greg KH
Quoted 42 lines · Alessio Balsini
From: xiao jin <[email protected]>
commit
54648cf1ec2d7f4b6a71767799c45676a138ca24upstream.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->fqin theblk_init_allocated_queue(). If the elevator init function called with error return, it will run into the fail case to free theq->fq.Then the
__blk_drain_queue()uses the same memory after the free of theq->fq, it will lead to the unpredictable event.The patch is to set
q->fqas NULL in the fail case ofblk_init_allocated_queue().Fixes commit 7c94e1c157a2 ("block: introduce blk_flush_queue to drive flush machinery")Cc <[email protected]>Reviewed-by Ming Lei <[email protected]>Reviewed-by Bart Van Assche <[email protected]>Signed-off-by xiao jin <[email protected]>Signed-off-by Jens Axboe <[email protected]>Signed-off-by Alessio Balsini <[email protected]>--- block/blk-core.c | 1 + 1 file changed, 1 insertion(+)block/blk-core.c +1
-1@@ -870,6 +870,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, fail:blk_free_flush_queue (q->fq); + q->fq =NULL ;return NULL ; }EXPORT_SYMBOL (blk_init_allocated_queue); --Quoted 2 lines
2.22.0.770.g0f2c4a37fd-goog
Guenter sent this backport a day before you did, so I took his version and added your s-o-b to it.
thanks,
greg k-h