Commit e8271201 authored by Mike Krinkin's avatar Mike Krinkin Committed by Jens Axboe

null_blk: fix use-after-free error

blk_end_request_all may free request, so we need to save
request_queue pointer before blk_end_request_all call.

The problem was introduced in commit cf8ecc5a
("null_blk: guarantee device restart in all irq modes")
and causes general protection fault with slab poisoning
enabled.

Fixes: cf8ecc5a ("null_blk: guarantee device
       restart in all irq modes")
Signed-off-by: default avatarMike Krinkin <krinkin.m.u@gmail.com>
Reviewed-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 23688bf4
...@@ -219,6 +219,9 @@ static void end_cmd(struct nullb_cmd *cmd) ...@@ -219,6 +219,9 @@ static void end_cmd(struct nullb_cmd *cmd)
{ {
struct request_queue *q = NULL; struct request_queue *q = NULL;
if (cmd->rq)
q = cmd->rq->q;
switch (queue_mode) { switch (queue_mode) {
case NULL_Q_MQ: case NULL_Q_MQ:
blk_mq_end_request(cmd->rq, 0); blk_mq_end_request(cmd->rq, 0);
...@@ -232,9 +235,6 @@ static void end_cmd(struct nullb_cmd *cmd) ...@@ -232,9 +235,6 @@ static void end_cmd(struct nullb_cmd *cmd)
goto free_cmd; goto free_cmd;
} }
if (cmd->rq)
q = cmd->rq->q;
/* Restart queue if needed, as we are freeing a tag */ /* Restart queue if needed, as we are freeing a tag */
if (q && !q->mq_ops && blk_queue_stopped(q)) { if (q && !q->mq_ops && blk_queue_stopped(q)) {
unsigned long flags; unsigned long flags;
......
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