4 files changed, 16 insertions, 8 deletions

diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 1a578b2a437b..345acca576b3 100644
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -106,7 +106,8 @@ static int nd_blk_rw_integrity(struct nd_namespace_blk *nsblk,
 
                 len -= cur_len;
                 dev_offset += cur_len;
-                bvec_iter_advance(bip->bip_vec, &bip->bip_iter, cur_len);
+                if (!bvec_iter_advance(bip->bip_vec, &bip->bip_iter, cur_len))
+                        return -EIO;
         }
 
         return err;
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index b5caaee78bbf..d00c10f382f0 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -985,7 +985,8 @@ static int btt_rw_integrity(struct btt *btt, struct bio_integrity_payload *bip,
 
                 len -= cur_len;
                 meta_nsoff += cur_len;
-                bvec_iter_advance(bip->bip_vec, &bip->bip_iter, cur_len);
+                if (!bvec_iter_advance(bip->bip_vec, &bip->bip_iter, cur_len))
+                        return -EIO;
         }
 
         return ret;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index b3b5f5a89a9c..d5e8689f86b8 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -167,8 +167,10 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
 
         if (bio_no_advance_iter(bio))
                 iter->bi_size -= bytes;
-        else
+        else {
                 bvec_iter_advance(bio->bi_io_vec, iter, bytes);
+                /* TODO: It is reasonable to complete bio with error here. */
+        }
 }
 
 #define __bio_for_each_segment(bvl, bio, iter, start)                   \
diff --git a/include/linux/bvec.h b/include/linux/bvec.h
index 89b65b82d98f..de317b4c13c1 100644
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
@@ -22,6 +22,7 @@
 
 #include <linux/kernel.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 
 /*
  * was unsigned short, but we might as well be ready for > 64kB I/O pages
@@ -66,12 +67,14 @@ struct bvec_iter {
         .bv_offset      = bvec_iter_offset((bvec), (iter)),     \
 })
 
-static inline void bvec_iter_advance(const struct bio_vec *bv,
-                                     struct bvec_iter *iter,
-                                     unsigned bytes)
+static inline bool bvec_iter_advance(const struct bio_vec *bv,
+                struct bvec_iter *iter, unsigned bytes)
 {
-        WARN_ONCE(bytes > iter->bi_size,
-                  "Attempted to advance past end of bvec iter\n");
+        if (WARN_ONCE(bytes > iter->bi_size,
+                     "Attempted to advance past end of bvec iter\n")) {
+                iter->bi_size = 0;
+                return false;
+        }
 
         while (bytes) {
                 unsigned iter_len = bvec_iter_len(bv, *iter);
@@ -86,6 +89,7 @@ static inline void bvec_iter_advance(const struct bio_vec *bv,
                         iter->bi_idx++;
                 }
         }
+        return true;
 }
 
 #define for_each_bvec(bvl, bio_vec, iter, start)                        \