1 files changed, 7 insertions, 0 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 89a4e42b9aad..ce357602f471 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3027,6 +3027,13 @@ void guard_bio_eod(int op, struct bio *bio)
         /* Uhhuh. We've got a bio that straddles the device size! */
         truncated_bytes = bio->bi_iter.bi_size - (maxsector << 9);
 
+        /*
+         * The bio contains more than one segment which spans EOD, just return
+         * and let IO layer turn it into an EIO
+         */
+        if (truncated_bytes > bvec->bv_len)
+                return;
+
         /* Truncate the bio.. */
         bio->bi_iter.bi_size -= truncated_bytes;
         bvec->bv_len -= truncated_bytes;