block: allow for_each_bvec to support zero len bvec
Subsystems (2)
PATCH v2 1/1 block: allow for_each_bvec to support zero len bvec
Block layer usually doesn't support or allow zero-length bvec. Since commit 1bdc76aea115 ("iov_iter: use bvec iterator to implement iterate_bvec()"), iterate_bvec() switches to bvec iterator. However, Al mentioned that 'Zero-length segments are not disallowed' in iov_iter.
Fixes for_each_bvec() so that it can move on after seeing one zero length bvec.
---
V2:
- fix reported-by tag
include/linux/bvec.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
include/linux/bvec.h +8 -1
@@ -117,11 +117,18 @@ static inline bool bvec_iter_advance(const struct bio_vec *bv,return true; } +static inline void bvec_iter_skip_zero_bvec (struct bvec_iter *iter) +{ + iter->bi_bvec_done =0 ; + iter->bi_idx++; +} +#define for_each_bvec (bvl, bio_vec, iter, start) \ for (iter = (start); \ (iter).bi_size && \ ((bvl = bvec_iter_bvec((bio_vec), (iter))), 1); \ - bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len)) + (bvl).bv_len ? bvec_iter_advance((bio_vec), &(iter), \ + (bvl).bv_len) : bvec_iter_skip_zero_bvec(&(iter)))/* for iterating one bio from start to end */ #define BVEC_ITER_ALL_INIT (struct bvec_iter) \
Signature · 1 line
2.25.2
Quoted 50 lines · Ming Lei
Block layer usually doesn't support or allow zero-length bvec. Since commit
1bdc76aea115("iov_iter: use bvec iterator to implementiterate_bvec()"),iterate_bvec()switches to bvec iterator. However, Al mentioned that 'Zero-length segments are not disallowed' iniov_iter.Fixes
for_each_bvec()so that it can move on after seeing one zero length bvec.Signed-off-by Ming Lei <[email protected]>Fixes 1bdc76aea115 ("iov_iter: use bvec iterator to implement iterate_bvec()")Reported-by syzbot <[email protected]>Tested-by Tetsuo Handa <[email protected]>Cc Al Viro <[email protected]>Cc Matthew Wilcox <[email protected]>Cc <[email protected]>---
V2:
- fix reported-by taginclude/linux/bvec.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)include/linux/bvec.h +8
-1@@ -117,11 +117,18 @@ static inline bool bvec_iter_advance(const struct bio_vec *bv,return true; } +static inline void bvec_iter_skip_zero_bvec (struct bvec_iter *iter) +{ + iter->bi_bvec_done =0 ; + iter->bi_idx++; +} +#define for_each_bvec (bvl, bio_vec, iter, start) \ for (iter = (start); \ (iter).bi_size && \ ((bvl = bvec_iter_bvec((bio_vec), (iter))), 1); \ - bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len)) + (bvl).bv_len ? bvec_iter_advance((bio_vec), &(iter), \ + (bvl).bv_len) : bvec_iter_skip_zero_bvec(&(iter)))/* for iterating one bio from start to end */ #define BVEC_ITER_ALL_INIT (struct bvec_iter) \Signature · 1 line
2.25.2
Hello Jens,
Looks at least two reports can be fixed by this patch, so could you take a look?
Thanks,
Ming
Quoted 7 lines · Ming Lei
Block layer usually doesn't support or allow zero-length bvec. Since commit
1bdc76aea115("iov_iter: use bvec iterator to implementiterate_bvec()"),iterate_bvec()switches to bvec iterator. However, Al mentioned that 'Zero-length segments are not disallowed' iniov_iter.Fixes
for_each_bvec()so that it can move on after seeing one zero length bvec.
Applied, thanks.
Signature · 1 line
Jens Axboe