diff --git a/block/bio.c b/block/bio.c
index b58bce6b5fea..5057047194c4 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1026,6 +1026,8 @@ int bio_add_page(struct bio *bio, struct page *page,
 {
 	if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)))
 		return 0;
+	if (WARN_ON_ONCE(len == 0))
+		return 0;
 	if (bio->bi_iter.bi_size > BIO_MAX_SIZE - len)
 		return 0;