diff options
| author | NeilBrown <neilb@suse.com> | 2015-09-24 07:25:36 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-10-02 09:23:43 +0200 |
| commit | 36707bb2e7c6730d79d6cdc6d1475d3d7e94c518 (patch) | |
| tree | 37ea9a4b0e716212bfd411f4c2d9e971ff8dc5f3 /drivers/md/raid5.c | |
| parent | raid5: update analysis state for failed stripe (diff) | |
| download | linux-36707bb2e7c6730d79d6cdc6d1475d3d7e94c518.tar.xz linux-36707bb2e7c6730d79d6cdc6d1475d3d7e94c518.zip | |
md/raid5: don't index beyond end of array in need_this_block().
When need_this_block probably shouldn't be called when there
are more than 2 failed devices, we really don't want it to try
indexing beyond the end of the failed_num[] of fdev[] arrays.
So limit the loops to at most 2 iterations.
Reported-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 2105e5f1fd31..d66ff723df45 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3304,7 +3304,7 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s, */ return 0; - for (i = 0; i < s->failed; i++) { + for (i = 0; i < s->failed && i < 2; i++) { if (fdev[i]->towrite && !test_bit(R5_UPTODATE, &fdev[i]->flags) && !test_bit(R5_OVERWRITE, &fdev[i]->flags)) @@ -3328,7 +3328,7 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s, sh->sector < sh->raid_conf->mddev->recovery_cp) /* reconstruct-write isn't being forced */ return 0; - for (i = 0; i < s->failed; i++) { + for (i = 0; i < s->failed && i < 2; i++) { if (s->failed_num[i] != sh->pd_idx && s->failed_num[i] != sh->qd_idx && !test_bit(R5_UPTODATE, &fdev[i]->flags) && |