summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Kuai <yukuai3@huawei.com>2023-05-24 09:41:18 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-09 10:32:29 +0200
commitd3103fc0d1914ae21d717720a5c2131be4b42b24 (patch)
treee12c450b7631bea255c8ff333163832042231d60
parent599e19202be2af0a179c40ae94a94a061fef29e7 (diff)
downloadlinux-d3103fc0d1914ae21d717720a5c2131be4b42b24.tar.gz
linux-d3103fc0d1914ae21d717720a5c2131be4b42b24.tar.bz2
linux-d3103fc0d1914ae21d717720a5c2131be4b42b24.zip
md/raid5: fix miscalculation of 'end_sector' in raid5_read_one_chunk()
commit 8557dc27126949c702bd3aafe8a7e0b7e4fcb44c upstream. 'end_sector' is compared to 'rdev->recovery_offset', which is offset to rdev, however, commit e82ed3a4fbb5 ("md/raid6: refactor raid5_read_one_chunk") changes the calculation of 'end_sector' to offset to the array. Fix this miscalculation. Fixes: e82ed3a4fbb5 ("md/raid6: refactor raid5_read_one_chunk") Cc: stable@vger.kernel.org # v5.12+ Signed-off-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Song Liu <song@kernel.org> Link: https://lore.kernel.org/r/20230524014118.3172781-1-yukuai1@huaweicloud.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/md/raid5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e4c82ecbaf0d..c2a42486f985 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5408,7 +5408,7 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)
sector = raid5_compute_sector(conf, raid_bio->bi_iter.bi_sector, 0,
&dd_idx, NULL);
- end_sector = bio_end_sector(raid_bio);
+ end_sector = sector + bio_sectors(raid_bio);
rcu_read_lock();
if (r5c_big_stripe_cached(conf, sector))