[PATCH] Prevent user from using --stop with ambiguous args

[PATCH] Prevent user from using --stop with ambiguous args

[Mariusz Tkaczyk]

From: Norbert Szulc <norbert.szulc@intel.com>

When both --scan and device name is passed to --stop action,
then is executed only for given device. Scan is ignored.

Block the operation when both --scan and device name are passed.

Signed-off-by: Norbert Szulc <norbert.szulc@intel.com>
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
---
 mdadm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mdadm.c b/mdadm.c
index 493d70e4..9f5f7934 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -2039,6 +2039,11 @@ static int misc_list(struct mddev_dev *devlist,
 				rv |= Manage_run(dv->devname, mdfd, c);
 				break;
 			case 'S':
+				if (c->scan) {
+					pr_err("--stop not meaningful with both a --scan assembly and a device name.\n");
+					rv |= 1;
+					break;
+				}
 				rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0);
 				break;
 			case 'o':
-- 
2.26.2

Re: [PATCH] Prevent user from using --stop with ambiguous args

[Jes Sorensen]

On 5/5/21 7:01 AM, Mariusz Tkaczyk wrote:
> From: Norbert Szulc <norbert.szulc@intel.com>
> 
> When both --scan and device name is passed to --stop action,
> then is executed only for given device. Scan is ignored.
> 
> Block the operation when both --scan and device name are passed.
> 
> Signed-off-by: Norbert Szulc <norbert.szulc@intel.com>
> Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
> ---
>  mdadm.c | 5 +++++
>  1 file changed, 5 insertions(+)

Applied!

Thanks,
Jes