| From 41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Mon Sep 17 00:00:00 2001 |
| From: Logan Gunthorpe <logang@deltatee.com> |
| Date: Wed, 22 Jun 2022 14:25:12 -0600 |
| Subject: [PATCH] mdadm: Fix optional --write-behind parameter |
| |
| 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. |
| |
| Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=41edf6f45895193f4a523cb0a08d639c9ff9ccc9] |
| |
| Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.") |
| Cc: Mateusz Grzonka <mateusz.grzonka@intel.com> |
| Signed-off-by: Logan Gunthorpe <logang@deltatee.com> |
| Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> |
| Signed-off-by: Jes Sorensen <jes@trained-monkey.org> |
| Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| --- |
| mdadm.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/mdadm.c b/mdadm.c |
| index d0c5e6de..56722ed9 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); |
| -- |
| 2.25.1 |
| |