Skip to content

Commit

Permalink
bcache: Fix a null ptr deref regression
Browse files Browse the repository at this point in the history
commit 2fe80d3 upstream.

Commit c0f04d8 ("bcache: Fix flushes in writeback mode") was fixing
a reported data corruption bug, but it seems some last minute
refactoring or rebasing introduced a null pointer deref.

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Reported-by: Gabriel de Perthuis <g2p.code@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Kent Overstreet authored and Greg Kroah-Hartman committed Oct 14, 2013
1 parent c068496 commit fe16445
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/md/bcache/request.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,7 @@ static void request_write(struct cached_dev *dc, struct search *s)
closure_bio_submit(bio, cl, s->d);
} else {
bch_writeback_add(dc);
s->op.cache_bio = bio;

if (bio->bi_rw & REQ_FLUSH) {
/* Also need to send a flush to the backing device */
Expand All @@ -1008,8 +1009,6 @@ static void request_write(struct cached_dev *dc, struct search *s)
flush->bi_private = cl;

closure_bio_submit(flush, cl, s->d);
} else {
s->op.cache_bio = bio;
}
}
out:
Expand Down

0 comments on commit fe16445

Please sign in to comment.