Skip to content

Commit

Permalink
block: fix use-after-free in block flush handling
Browse files Browse the repository at this point in the history
A recent commit reused the original request flags for the flush
queue handling. However, for some of the kick flush cases, the
original request was already completed. This caused a use after
free, if blk-mq wasn't used.

Fixes: 84fca1b ("block: pass failfast and driver-specific flags to flush requests")
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Jens Axboe committed Jun 9, 2018
1 parent 7701619 commit 190b02e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion block/blk-flush.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,11 @@ static bool blk_flush_complete_seq(struct request *rq,
struct request_queue *q = rq->q;
struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];
bool queued = false, kicked;
unsigned int cmd_flags;

BUG_ON(rq->flush.seq & seq);
rq->flush.seq |= seq;
cmd_flags = rq->cmd_flags;

if (likely(!error))
seq = blk_flush_cur_seq(rq);
Expand Down Expand Up @@ -212,7 +214,7 @@ static bool blk_flush_complete_seq(struct request *rq,
BUG();
}

kicked = blk_kick_flush(q, fq, rq->cmd_flags);
kicked = blk_kick_flush(q, fq, cmd_flags);
return kicked | queued;
}

Expand Down

0 comments on commit 190b02e

Please sign in to comment.