[mdadm,v1,07/14] mdadm: Fix optional --write-behind parameter

Commit Message

Logan Gunthorpe June 9, 2022, 9:11 p.m. UTC

The commit noted below changed the behaviour of --write-behind to
require an argument. This broke the 06wrmostly test with the error:

  mdadm: Invalid value for maximum outstanding write-behind writes: (null).
         Must be between 0 and 16383.

To fix this, check if optarg is NULL before parising it, as the origial
code did.

Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.")
Cc: Mateusz Grzonka <[e-mail]>
Signed-off-by: Logan Gunthorpe <[e-mail]>
---
 mdadm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Mariusz Tkaczyk June 20, 2022, 2:37 p.m. UTC | #1

On Thu,  9 Jun 2022 15:11:23 -0600
Logan Gunthorpe <[e-mail]> wrote:

> The commit noted below changed the behaviour of --write-behind to
> require an argument. This broke the 06wrmostly test with the error:
> 
>   mdadm: Invalid value for maximum outstanding write-behind writes: (null).
>          Must be between 0 and 16383.
> 
> To fix this, check if optarg is NULL before parising it, as the origial
> code did.
> 
> Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.")
> Cc: Mateusz Grzonka <[e-mail]>
> Signed-off-by: Logan Gunthorpe <[e-mail]>
> ---

Acked-by: Mariusz Tkaczyk <[e-mail]>

Patch

diff --git a/mdadm.c b/mdadm.c
index d0c5e6def901..56722ed997a2 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1201,8 +1201,9 @@  int main(int argc, char *argv[])
 		case O(BUILD, WriteBehind):
 		case O(CREATE, WriteBehind):
 			s.write_behind = DEFAULT_MAX_WRITE_BEHIND;
-			if (parse_num(&s.write_behind, optarg) != 0 ||
-			s.write_behind < 0 || s.write_behind > 16383) {
+			if (optarg &&
+			    (parse_num(&s.write_behind, optarg) != 0 ||
+			     s.write_behind < 0 || s.write_behind > 16383)) {
 				pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n",
 						optarg);
 				exit(2);