Commit 0d11e6ac authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe

blk-mq: fix use-after-free of request

If accounting is on, we will do the IO completion accounting after
we have freed the request. Fix that by moving it sooner instead.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 959a35f1
...@@ -312,12 +312,12 @@ void blk_mq_complete_request(struct request *rq, int error) ...@@ -312,12 +312,12 @@ void blk_mq_complete_request(struct request *rq, int error)
blk_account_io_completion(rq, bytes); blk_account_io_completion(rq, bytes);
blk_account_io_done(rq);
if (rq->end_io) if (rq->end_io)
rq->end_io(rq, error); rq->end_io(rq, error);
else else
blk_mq_free_request(rq); blk_mq_free_request(rq);
blk_account_io_done(rq);
} }
void __blk_mq_end_io(struct request *rq, int error) void __blk_mq_end_io(struct request *rq, int error)
......
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