From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sun, 4 Nov 2018 00:19:04 +0000 (-0400)
Subject: bcachefs: fix bounds checks in bch2_bio_map()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=636ad1d391b9e0f22107ace04e6dbc07d8875739;p=linux.git

bcachefs: fix bounds checks in bch2_bio_map()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c
index 75053322d0f03..ed90bd3a5d188 100644
--- a/fs/bcachefs/util.c
+++ b/fs/bcachefs/util.c
@@ -529,15 +529,17 @@ void bch2_bio_map(struct bio *bio, void *base)
 
 	BUG_ON(!bio->bi_iter.bi_size);
 	BUG_ON(bio->bi_vcnt);
+	BUG_ON(!bio->bi_max_vecs);
 
 	bv->bv_offset = base ? offset_in_page(base) : 0;
 	goto start;
 
 	for (; size; bio->bi_vcnt++, bv++) {
+		BUG_ON(bio->bi_vcnt >= bio->bi_max_vecs);
+
 		bv->bv_offset	= 0;
 start:		bv->bv_len	= min_t(size_t, PAGE_SIZE - bv->bv_offset,
 					size);
-		BUG_ON(bio->bi_vcnt >= bio->bi_max_vecs);
 		if (base) {
 			bv->bv_page = is_vmalloc_addr(base)
 				? vmalloc_to_page(base)