Merge branch 'for-7.1/block' into for-next

axboe · axboe · commit 5c72e4d0ec45 · 2026-03-17T19:32:39.000-06:00
* for-7.1/block:
  block: reject zero length in bio_add_page()
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -1026,6 +1026,8 @@ int bio_add_page(struct bio bio, struct page page,`
`1026`	`1026`	`{`
`1027`	`1027`	`if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)))`
`1028`	`1028`	`return 0;`
	`1029`	`+ if (WARN_ON_ONCE(len == 0))`
	`1030`	`+ return 0;`
`1029`	`1031`	`if (bio->bi_iter.bi_size > BIO_MAX_SIZE - len)`
`1030`	`1032`	`return 0;`
`1031`	`1033`