Skip to contentSkip to conversation

block: fix mp_bvec_for_each_page

PATCH In review Ming Lei 2 participants 2 messages Feb 28, 2019 Block layer

lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 block: fix mp_bvec_for_each_page

mp_bvec_for_each_page() may miss the 1st page in case that the bvec ends before last byte of the 1st PAGE.

So fix it by checking against the last page.

Fixes 05d5585e42a399700 ("block: introduce mp_bvec_for_each_page() for iterating over page")
---
 include/linux/bvec.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bvec.h +1 -1
index 98a140fa4dac..85894d5000a1 100644
@@ -197,7 +197,7 @@ static inline void mp_bvec_last_segment(const struct bio_vec *bvec,
 
 #define mp_bvec_for_each_page(pg, bv, i)				\
 	for (i = (bv)->bv_offset / PAGE_SIZE;				\
-		(i < (((bv)->bv_offset + (bv)->bv_len) / PAGE_SIZE)) && \
+		(i <= (((bv)->bv_offset + (bv)->bv_len - 1) / PAGE_SIZE)) && \
 		(pg = bvec_nth_page((bv)->bv_page, i)); i += 1)
 
 #endif /* __LINUX_BVEC_ITER_H */
Signature · 1 line
2.9.5
maintainer
#1 lore raw
Quoted 4 lines · Ming Lei

mp_bvec_for_each_page() may miss the 1st page in case that the bvec ends before last byte of the 1st PAGE.

So fix it by checking against the last page.

Thanks, I just folded this in.

Signature · 1 line
Jens Axboe