From: Norbert Szulc <norbert.szulc@intel.com>
Date: Wed, 5 May 2021 11:01:02 +0000 (+0200)
Subject: Prevent user from using --stop with ambiguous args
X-Git-Tag: mdadm-4.2-rc2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0530e2e0d8c9ecb5171e70bc48e1a6566f317378;p=thirdparty%2Fmdadm.git

Prevent user from using --stop with ambiguous args

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>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---

diff --git a/mdadm.c b/mdadm.c
index 9a4317d5..dcc26ba8 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -2041,6 +2041,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':