Revert "mdadm: fix coredump of mdadm --monitor -r"
PATCH 1/1 Revert "mdadm: fix coredump of mdadm --monitor -r"
This reverts commit 546047688e1c64638f462147c755b58119cabdc8.
The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
If the current code reverts this commit, both issues are still fixed.
The original problem reported that the fix tried to address
was: The --monitor -r option requires a parameter, otherwise a null pointer will be manipulated when converting to integer data, and a core dump will appear.
The original problem was really fixed with:60815698c0a Refactor parse_num and use it to parse optarg. Which added a check for NULL in 'optarg' before moving it to the 'increments' variable.
New issue: When trying to remove a device using the short argument -r, instead of the long argument --remove, the output is empty. The problem started when commit 546047688e1c was added.
Steps to Reproduce:
1. create/assemble /dev/md0 device
2. mdadm --manage /dev/md0 -r /dev/vdxx
Actual results:
Nothing, empty output, nothing happens, the device is still connected to the array.
The output should have stated "mdadm: hot remove failed for /dev/vdxx: Device or resource busy", if the device was still active. Or it should remove the device and print a message:
mdadm: set /dev/vdd faulty in /dev/md0
mdadm: hot removed /dev/vdd from /dev/md0
The following commit should be reverted as it breaks mdadm --manage -r.
commit 546047688e1c64638f462147c755b58119cabdc8
Author: Wu Guanghao <[email protected]>
Date: Mon Aug 16 15:24:51 2021 +0800
mdadm: fix coredump of mdadm --monitor -r
-Nigel
--- ReadMe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
ReadMe.c +3 -3
@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";* found, it is started. */ -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k" ; +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_auto_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ;struct option long_options[] = { {"manage" ,0 ,0 , ManageOpt},
Signature · 1 line
2.29.2
Quoted 44 lines · Nigel Croxon
This reverts commit
546047688e1c64638f462147c755b58119cabdc8.The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
If the current code reverts this commit, both issues are still fixed.
The original problem reported that the fix tried to address
was: The --monitor -r option requires a parameter, otherwise a null pointer will be manipulated when converting to integer data, and a core dump will appear.The original problem was really fixed with:
60815698c0aRefactorparse_numand use it to parse optarg. Which added a check for NULL in 'optarg' before moving it to the 'increments' variable.New issue: When trying to remove a device using the short argument -r, instead of the long argument --remove, the output is empty. The problem started when commit
546047688e1cwas added.Steps to Reproduce:
1. create/assemble/dev/md0device
2. mdadm --manage/dev/md0-r/dev/vdxxActual results:
Nothing, empty output, nothing happens, the device is still connected to the array.The output should have stated "mdadm: hot remove failed for
/dev/vdxx: Device or resource busy", if the device was still active. Or it should remove the device and print a message:mdadm: set
/dev/vddfaulty in/dev/md0
mdadm: hot removed/dev/vddfrom/dev/md0The following commit should be reverted as it breaks mdadm --manage -r.
Quoted 6 lines
commit
546047688e1c64638f462147c755b58119cabdc8
Author: Wu Guanghao <[email protected]>
Date: Mon Aug 16 15:24:51 2021 +0800
mdadm: fix coredump of mdadm --monitor -r-Nigel
Maybe it could be better to remove the above signature?
Quoted 2 lines
Signed-off-by Nigel Croxon <[email protected]>
Thanks.
Coly Li
Quoted 23 lines
--- ReadMe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)ReadMe.c +3
-3@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";* found, it is started. */ -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k" ; +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_auto_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ;struct option long_options[] = { {"manage" ,0 ,0 , ManageOpt},
Quoted 65 lines · Nigel Croxon
This reverts commit
546047688e1c64638f462147c755b58119cabdc8.The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
If the current code reverts this commit, both issues are still fixed.
The original problem reported that the fix tried to address
was: The --monitor -r option requires a parameter, otherwise a null pointer will be manipulated when converting to integer data, and a core dump will appear.The original problem was really fixed with:
60815698c0aRefactorparse_numand use it to parse optarg. Which added a check for NULL in 'optarg' before moving it to the 'increments' variable.New issue: When trying to remove a device using the short argument -r, instead of the long argument --remove, the output is empty. The problem started when commit
546047688e1cwas added.Steps to Reproduce:
1. create/assemble/dev/md0device
2. mdadm --manage/dev/md0-r/dev/vdxxActual results:
Nothing, empty output, nothing happens, the device is still connected to the array.The output should have stated "mdadm: hot remove failed for
/dev/vdxx: Device or resource busy", if the device was still active. Or it should remove the device and print a message:mdadm: set
/dev/vddfaulty in/dev/md0
mdadm: hot removed/dev/vddfrom/dev/md0The following commit should be reverted as it breaks mdadm --manage -r.
commit
546047688e1c64638f462147c755b58119cabdc8
Author: Wu Guanghao <[email protected]>
Date: Mon Aug 16 15:24:51 2021 +0800
mdadm: fix coredump of mdadm --monitor -r-Nigel
Signed-off-by Nigel Croxon <[email protected]>--- ReadMe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)ReadMe.c +0
-1@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";* found, it is started. */ -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k" ;
ReadMe.c char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n"; · line 91
Quoted 10 lines
ReadMe.c +3
-2+char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_auto_options[]= -"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ; +"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:" ;struct option long_options[] = { {"manage" ,0 ,0 , ManageOpt},
Jes, That is the status of this patch?
Thanks, Nigel
Quoted 86 lines · Nigel Croxon
Quoted 74 lines · Nigel Croxon
This reverts commit
546047688e1c64638f462147c755b58119cabdc8.The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
If the current code reverts this commit, both issues are still fixed.
The original problem reported that the fix tried to address was: The --monitor -r option requires a parameter, otherwise a null pointer will be manipulated when converting to integer data, and a core dump will appear.
The original problem was really fixed with:
60815698c0aRefactorparse_numand use it to parse optarg. Which added a check for NULL in 'optarg' before moving it to the 'increments' variable.New issue: When trying to remove a device using the short argument -r, instead of the long argument --remove, the output is empty. The problem started when commit
546047688e1cwas added.Steps to Reproduce:
1. create/assemble/dev/md0device
2. mdadm --manage/dev/md0-r/dev/vdxxActual results:
Nothing, empty output, nothing happens, the device is still connected to the array.The output should have stated "mdadm: hot remove failed for
/dev/vdxx: Device or resource busy", if the device was still active. Or it should remove the device and print a message:mdadm: set
/dev/vddfaulty in/dev/md0
mdadm: hot removed/dev/vddfrom/dev/md0The following commit should be reverted as it breaks mdadm --manage -r.
commit
546047688e1c64638f462147c755b58119cabdc8
Author: Wu Guanghao <[email protected]>
Date: Mon Aug 16 15:24:51 2021 +0800
mdadm: fix coredump of mdadm --monitor -r-Nigel
Signed-off-by Nigel Croxon <[email protected]>---
ReadMe.c| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)ReadMe.c +1
-1@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - "VERS_DATE EXTRAVERSION "\n"; * found, it is started. */ -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k"; +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_options[]=
- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; +Quoted 8 lines
"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; char short_bitmap_auto_options[]=
- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; struct option long_options[] = {
{"manage", 0, 0, ManageOpt},Jes, That is the status of this patch?
Quoted 1 line
Thanks, Nigel
Jes, Is there an issue with reverting this patch?
-Nigel
Quoted 87 lines · Nigel Croxon
Quoted 86 lines · Nigel Croxon
Quoted 74 lines · Nigel Croxon
This reverts commit
546047688e1c64638f462147c755b58119cabdc8.The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
If the current code reverts this commit, both issues are still fixed.
The original problem reported that the fix tried to address was: The --monitor -r option requires a parameter, otherwise a null pointer will be manipulated when converting to integer data, and a core dump will appear.
The original problem was really fixed with:
60815698c0aRefactorparse_numand use it to parse optarg. Which added a check for NULL in 'optarg' before moving it to the 'increments' variable.New issue: When trying to remove a device using the short argument -r, instead of the long argument --remove, the output is empty. The problem started when commit
546047688e1cwas added.Steps to Reproduce:
1. create/assemble/dev/md0device
2. mdadm --manage/dev/md0-r/dev/vdxxActual results:
Nothing, empty output, nothing happens, the device is still connected to the array.The output should have stated "mdadm: hot remove failed for
/dev/vdxx: Device or resource busy", if the device was still active. Or it should remove the device and print a message:mdadm: set
/dev/vddfaulty in/dev/md0
mdadm: hot removed/dev/vddfrom/dev/md0The following commit should be reverted as it breaks mdadm --manage -r.
commit
546047688e1c64638f462147c755b58119cabdc8
Author: Wu Guanghao <[email protected]>
Date: Mon Aug 16 15:24:51 2021 +0800
mdadm: fix coredump of mdadm --monitor -r-Nigel
Signed-off-by Nigel Croxon <[email protected]>---
ReadMe.c| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)ReadMe.c +1
-1@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - "VERS_DATE EXTRAVERSION "\n"; * found, it is started. */ -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k"; +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:" ;char short_bitmap_options[]=
- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; +Quoted 8 lines
"-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; char short_bitmap_auto_options[]=
- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; struct option long_options[] = {
{"manage", 0, 0, ManageOpt},Jes, That is the status of this patch?
Quoted 4 lines
Quoted 1 line
Thanks, Nigel
Jes, Is there an issue with reverting this patch?
The fact that I am swamped with my regular work and it hadn't made it into patchworks. It's applied now.
Jes
Quoted 14 lines
2022年6月18日 03:35,Jes Sorensen <[email protected]> 写道:
Quoted 9 lines · Nigel Croxon
Quoted 8 lines · Nigel Croxon
Quoted 7 lines · Nigel Croxon
This reverts commit
546047688e1c64638f462147c755b58119cabdc8.The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
[snipped]
Quoted 10 lines
Quoted 7 lines
Quoted 4 lines
Jes, That is the status of this patch?
Thanks, Nigel
Jes, Is there an issue with reverting this patch?
The fact that I am swamped with my regular work and it hadn't made it into patchworks. It's applied now.
Hi Jes,
Since I don’t see this patch applied, so I send it again in my “mdadm-CI for-jes/20220620: patches for merge” series with my Acked-by.
Just for your information. Thank you in advance for taking care of them.
Coly Li
Quoted 24 lines · Coly Li
Quoted 14 lines
2022年6月18日 03:35,Jes Sorensen <[email protected]> 写道:
Quoted 9 lines · Nigel Croxon
Quoted 8 lines · Nigel Croxon
Quoted 7 lines · Nigel Croxon
This reverts commit
546047688e1c64638f462147c755b58119cabdc8.The change from commit mdadm: fix coredump of mdadm --monitor -r broke the printing of the return message when passing -r to mdadm --manage, the removal of a device from an array.
[snipped]
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Jes, That is the status of this patch?
Thanks, Nigel
Jes, Is there an issue with reverting this patch?
Quoted 8 lines
Quoted 2 lines
The fact that I am swamped with my regular work and it hadn't made it into patchworks. It's applied now.
Hi Jes,
Since I don’t see this patch applied, so I send it again in my “mdadm-CI for-jes/20220620: patches for merge” series with my Acked-by.
Just for your information. Thank you in advance for taking care of them.
Hi Coly,
Thanks, I just forgot to push it on Friday. I'll need to look through the rest soon.
Cheers,
Jes