The patch titled
block: fix the bio_vec array index out-of-bounds test
has been added to the -mm tree. Its filename is
block-fix-the-bio_vec-array-index-out-of-bounds-test.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: block: fix the bio_vec array index out-of-bounds test
From: Kazuhisa Ichikawa <ki@xxxxxxxxxxx>
Current bio_vec array index out-of-bounds test within
__end_that_request_first() does not seem correct.
It checks bio->bi_idx against bio->bi_vcnt, but the subsequent code uses
idx (which is, bio->bi_idx + next_idx) as the array index into bio_vec
array. This means that the test really make sense only at the first
iteration of !(nr_bytes >=bio->bi_size) case (when next_idx == zero). Fix
this by replacing bio->bi_idx with idx.
Signed-off-by: Kazuhisa Ichikawa <ki@xxxxxxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
block/blk-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN block/blk-core.c~block-fix-the-bio_vec-array-index-out-of-bounds-test block/blk-core.c
--- a/block/blk-core.c~block-fix-the-bio_vec-array-index-out-of-bounds-test
+++ a/block/blk-core.c
@@ -1863,10 +1863,10 @@ bool blk_update_request(struct request *
} else {
int idx = bio->bi_idx + next_idx;
- if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
+ if (unlikely(idx >= bio->bi_vcnt)) {
blk_dump_rq_flags(req, "__end_that");
printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
- __func__, bio->bi_idx, bio->bi_vcnt);
+ __func__, idx, bio->bi_vcnt);
break;
}
_
Patches currently in -mm which might be from ki@xxxxxxxxxxx are
block-fix-the-bio_vec-array-index-out-of-bounds-test.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
