1*4882a593SmuzhiyunFrom 41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Logan Gunthorpe <logang@deltatee.com> 3*4882a593SmuzhiyunDate: Wed, 22 Jun 2022 14:25:12 -0600 4*4882a593SmuzhiyunSubject: [PATCH] mdadm: Fix optional --write-behind parameter 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe commit noted below changed the behaviour of --write-behind to 7*4882a593Smuzhiyunrequire an argument. This broke the 06wrmostly test with the error: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun mdadm: Invalid value for maximum outstanding write-behind writes: (null). 10*4882a593Smuzhiyun Must be between 0 and 16383. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunTo fix this, check if optarg is NULL before parising it, as the origial 13*4882a593Smuzhiyuncode did. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunUpstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=41edf6f45895193f4a523cb0a08d639c9ff9ccc9] 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunFixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.") 18*4882a593SmuzhiyunCc: Mateusz Grzonka <mateusz.grzonka@intel.com> 19*4882a593SmuzhiyunSigned-off-by: Logan Gunthorpe <logang@deltatee.com> 20*4882a593SmuzhiyunAcked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> 21*4882a593SmuzhiyunSigned-off-by: Jes Sorensen <jes@trained-monkey.org> 22*4882a593SmuzhiyunSigned-off-by: Mingli Yu <mingli.yu@windriver.com> 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun mdadm.c | 5 +++-- 25*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 2 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/mdadm.c b/mdadm.c 28*4882a593Smuzhiyunindex d0c5e6de..56722ed9 100644 29*4882a593Smuzhiyun--- a/mdadm.c 30*4882a593Smuzhiyun+++ b/mdadm.c 31*4882a593Smuzhiyun@@ -1201,8 +1201,9 @@ int main(int argc, char *argv[]) 32*4882a593Smuzhiyun case O(BUILD, WriteBehind): 33*4882a593Smuzhiyun case O(CREATE, WriteBehind): 34*4882a593Smuzhiyun s.write_behind = DEFAULT_MAX_WRITE_BEHIND; 35*4882a593Smuzhiyun- if (parse_num(&s.write_behind, optarg) != 0 || 36*4882a593Smuzhiyun- s.write_behind < 0 || s.write_behind > 16383) { 37*4882a593Smuzhiyun+ if (optarg && 38*4882a593Smuzhiyun+ (parse_num(&s.write_behind, optarg) != 0 || 39*4882a593Smuzhiyun+ s.write_behind < 0 || s.write_behind > 16383)) { 40*4882a593Smuzhiyun pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n", 41*4882a593Smuzhiyun optarg); 42*4882a593Smuzhiyun exit(2); 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.25.1 45*4882a593Smuzhiyun 46