summaryrefslogtreecommitdiffstats
path: root/include/linux/bio.h
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2014-04-08 22:43:43 -0400
committerJens Axboe <axboe@fb.com>2014-04-09 08:00:01 -0600
commitb7aa84d9cb9f26da1a9312c3e39dbd1a3c25a426 (patch)
tree583b4d4a8cab1128b26c12e61a6cd598fcc268de /include/linux/bio.h
parent44bd70c347c466616e430b044c49d48fac29789d (diff)
downloadop-kernel-dev-b7aa84d9cb9f26da1a9312c3e39dbd1a3c25a426.zip
op-kernel-dev-b7aa84d9cb9f26da1a9312c3e39dbd1a3c25a426.tar.gz
block: Fix for_each_bvec()
Commit 4550dd6c6b062 introduced for_each_bvec() which iterates over each bvec attached to a bio or bip. However, the macro fails to check bi_size before dereferencing which can lead to crashes while counting/mapping integrity scatterlist segments. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Cc: Kent Overstreet <kmo@daterainc.com> Cc: Nicholas Bellinger <nab@linux-iscsi.org> Cc: <stable@vger.kernel.org> # v3.14+ Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/bio.h')
-rw-r--r--include/linux/bio.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 5a4d39b..5aa372a 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -216,9 +216,9 @@ static inline void bvec_iter_advance(struct bio_vec *bv, struct bvec_iter *iter,
}
#define for_each_bvec(bvl, bio_vec, iter, start) \
- for ((iter) = start; \
- (bvl) = bvec_iter_bvec((bio_vec), (iter)), \
- (iter).bi_size; \
+ for (iter = (start); \
+ (iter).bi_size && \
+ ((bvl = bvec_iter_bvec((bio_vec), (iter))), 1); \
bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len))
OpenPOWER on IntegriCloud