[PATCH] Fix for bcache regression

[PATCH] Fix for bcache regression

[Kent Overstreet]

Linus, please apply - the last fix in the bugfix series I sent you had an
embarassing screwup...

For 3.13, shall I start sending you pull requests directly?

[PATCH] bcache: Fix a null ptr deref regression

[Kent Overstreet]

c0f04d8 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>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
Reported-by: Gabriel de Perthuis <g2p.code@gmail.com>
---
 drivers/md/bcache/request.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index 71eb233..b6a74bc 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -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 */
@@ -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:
-- 
1.8.4.rc3

Re: [PATCH] Fix for bcache regression

[Jens Axboe]

On Thu, Oct 10 2013, Kent Overstreet wrote:
> Linus, please apply - the last fix in the bugfix series I sent you had an
> embarassing screwup...
> 
> For 3.13, shall I start sending you pull requests directly?

Sorry I dropped the ball on that one, it's the first time ever I've
missed a deadline. It's being ramped up again, kernel time will be
plenty again shortly.

-- 
Jens Axboe

Re: [PATCH] Fix for bcache regression

[Kent Overstreet]

On Thu, Oct 10, 2013 at 08:23:13PM -0600, Jens Axboe wrote:
> On Thu, Oct 10 2013, Kent Overstreet wrote:
> > Linus, please apply - the last fix in the bugfix series I sent you had an
> > embarassing screwup...
> > 
> > For 3.13, shall I start sending you pull requests directly?
> 
> Sorry I dropped the ball on that one, it's the first time ever I've
> missed a deadline. It's being ramped up again, kernel time will be
> plenty again shortly.

No worries, I've been behind on plenty of stuff too and wouldn't have
much room to complain :)

Probably best that the giant pull ended up waiting a bit longer anyways
with the bugs I've still been fixing. Anyways, bcache is self contained
enough I doubt it really matters, so whatever the two of you prefer is
fine by me.