raid5: fix duplicate checks for rdev->saved_raid_disk
PATCH RESEND 1/1 raid5: fix duplicate checks for rdev->saved_raid_disk
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
--- drivers/md/raid5.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/md/raid5.c +1 -2
@@ -8063,8 +8063,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)* find the disk ... but prefer rdev->saved_raid_disk * if possible. */ -if (rdev->saved_raid_disk >=0 && - rdev->saved_raid_disk >= first && +if (rdev->saved_raid_disk >= first && rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk;
Signature · 1 line
2.25.1
Song Liu
maintainerQuoted 7 lines · Jackie Liu
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
Signed-off-by Jackie Liu <[email protected]>
This looks identical to the original version. Which branch is this based on? Please rebase on top of md-next branch and resend the patch:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next
Thanks,
Song
Quoted 21 lines
--- drivers/md/raid5.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/raid5.c +1
-3@@ -8063,8 +8063,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)* find the disk ... but prefer rdev->saved_raid_disk * if possible. */ -if (rdev->saved_raid_disk >=0 && - rdev->saved_raid_disk >= first && +if (rdev->saved_raid_disk >= first && rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk; --2.25.1
Hi Song.
Quoted 10 lines · Song Liu
Quoted 7 lines · Jackie Liu
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
Signed-off-by Jackie Liu <[email protected]>This looks identical to the original version. Which branch is this based on?
I based on linux.git/v5.19-rc7, it's linus tree.
Quoted 3 lines
Please rebase on top of md-next branch and resend the patch:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next
Sure. will send new patch base this branch.
Quoted 25 lines
Thanks,
SongQuoted 21 lines
--- drivers/md/raid5.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/raid5.c +1
-3@@ -8063,8 +8063,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)* find the disk ... but prefer rdev->saved_raid_disk * if possible. */ -if (rdev->saved_raid_disk >=0 && - rdev->saved_raid_disk >= first && +if (rdev->saved_raid_disk >= first && rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk; --2.25.1
Hi, Song.
Quoted 7 lines · Song Liu
Quoted 6 lines · Jackie Liu
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
Quoted 7 lines
Quoted 1 line
Signed-off-by Jackie Liu <[email protected]>This looks identical to the original version. Which branch is this based on? Please rebase on top of md-next branch and resend the patch:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next
The md-next branch is lower than the upstream version, v5.19-rc5 adds a patch.
commit 617b365872a247480e9dcd50a32c8d1806b21861
Author: Mikulas Patocka <[email protected]> Date: Wed Jun 29 13:40:57 2022 -0400
dm raid: fix KASAN warning in raid5_add_disks
There's a KASAN warning in raid5_add_disk when running the LVM
testsuite.
The warning happens in the test lvconvert-raid-reshape-linear_to_raid6-single-type.sh. We fix the
warning
by verifying that rdev->saved_raid_disk is within limits.
drivers/md/raid5.c +1 -0
@@ -8065,6 +8065,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)*/ if (rdev->saved_raid_disk >=0 && rdev->saved_raid_disk >= first && + rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk;
...
can you rebase from upstream? Thanks.
--
Jackie
Quoted 24 lines
Thanks,
SongQuoted 21 lines
--- drivers/md/raid5.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/raid5.c +1
-3@@ -8063,8 +8063,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)* find the disk ... but prefer rdev->saved_raid_disk * if possible. */ -if (rdev->saved_raid_disk >=0 && - rdev->saved_raid_disk >= first && +if (rdev->saved_raid_disk >= first && rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk; --2.25.1
Song Liu
maintainerQuoted 53 lines · Jackie Liu
Hi, Song.
Quoted 7 lines · Song Liu
Quoted 6 lines · Jackie Liu
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
Quoted 7 lines
Quoted 1 line
Signed-off-by Jackie Liu <[email protected]>This looks identical to the original version. Which branch is this based on? Please rebase on top of md-next branch and resend the patch:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next
The md-next branch is lower than the upstream version, v5.19-rc5 adds a patch.
commit
617b365872a247480e9dcd50a32c8d1806b21861Author: Mikulas Patocka <[email protected]> Date: Wed Jun 29 13:40:57 2022 -0400dm raid: fix KASAN warning in
raid5_add_disksThere's a KASAN warning in
raid5_add_diskwhen running the LVM
testsuite.
The warning happens in the testlvconvert-raid-reshape-linear_to_raid6-single-type.sh. We fix the
warning
by verifying thatrdev->saved_raid_diskis within limits.Signed-off-by Mikulas Patocka <[email protected]>Signed-off-by Mike Snitzer <[email protected]>drivers/md/raid5.c +1
-0@@ -8065,6 +8065,7 @@ static int raid5_add_disk(struct mddev *mddev,struct md_rdev *rdev) */ if (rdev->saved_raid_disk >=0 && rdev->saved_raid_disk >= first && + rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk;
Quoted 1 line
can you rebase from upstream? Thanks.
ah, I see. Now it works. No need to resend.
Thanks,
Song
Song Liu
maintainerHi Jackie,
As suggested by Jens, I will postpone this fix until after the merge window.
Thanks,
Song
Quoted 61 lines · Song Liu
Quoted 53 lines · Jackie Liu
Hi, Song.
Quoted 7 lines · Song Liu
Quoted 6 lines · Jackie Liu
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
Quoted 7 lines
Quoted 1 line
Signed-off-by Jackie Liu <[email protected]>This looks identical to the original version. Which branch is this based on? Please rebase on top of md-next branch and resend the patch:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next
The md-next branch is lower than the upstream version, v5.19-rc5 adds a patch.
commit
617b365872a247480e9dcd50a32c8d1806b21861Author: Mikulas Patocka <[email protected]> Date: Wed Jun 29 13:40:57 2022 -0400dm raid: fix KASAN warning in
raid5_add_disksThere's a KASAN warning in
raid5_add_diskwhen running the LVM
testsuite.
The warning happens in the testlvconvert-raid-reshape-linear_to_raid6-single-type.sh. We fix the
warning
by verifying thatrdev->saved_raid_diskis within limits.Signed-off-by Mikulas Patocka <[email protected]>Signed-off-by Mike Snitzer <[email protected]>drivers/md/raid5.c +1
-0@@ -8065,6 +8065,7 @@ static int raid5_add_disk(struct mddev *mddev,struct md_rdev *rdev) */ if (rdev->saved_raid_disk >=0 && rdev->saved_raid_disk >= first && + rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk;Quoted 1 line
can you rebase from upstream? Thanks.
ah, I see. Now it works. No need to resend.
Thanks,
Song
Hi Song.
It's fine. Thanks.
--
Jackie Liu
Quoted 69 lines · Song Liu
Hi Jackie,
As suggested by Jens, I will postpone this fix until after the merge window.
Thanks,
SongQuoted 61 lines · Song Liu
Quoted 53 lines · Jackie Liu
Hi, Song.
Quoted 7 lines · Song Liu
Quoted 6 lines · Jackie Liu
From: Jackie Liu <[email protected]>
'first' will always be greater than or equal to 0, it is unnecessary to repeat the 0 check, clean it up.
Quoted 7 lines
Quoted 1 line
Signed-off-by Jackie Liu <[email protected]>This looks identical to the original version. Which branch is this based on? Please rebase on top of md-next branch and resend the patch:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next
The md-next branch is lower than the upstream version, v5.19-rc5 adds a patch.
commit
617b365872a247480e9dcd50a32c8d1806b21861Author: Mikulas Patocka <[email protected]> Date: Wed Jun 29 13:40:57 2022 -0400dm raid: fix KASAN warning in
raid5_add_disksThere's a KASAN warning in
raid5_add_diskwhen running the LVM
testsuite.
The warning happens in the testlvconvert-raid-reshape-linear_to_raid6-single-type.sh. We fix the
warning
by verifying thatrdev->saved_raid_diskis within limits.Signed-off-by Mikulas Patocka <[email protected]>Signed-off-by Mike Snitzer <[email protected]>drivers/md/raid5.c +1
-0@@ -8065,6 +8065,7 @@ static int raid5_add_disk(struct mddev *mddev,struct md_rdev *rdev) */ if (rdev->saved_raid_disk >=0 && rdev->saved_raid_disk >= first && + rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev ==NULL ) first = rdev->saved_raid_disk;Quoted 1 line
can you rebase from upstream? Thanks.
ah, I see. Now it works. No need to resend.
Thanks,
Song