From: Masahiro Yamada <masahiroy@kernel.org>
Date: Thu, 10 Feb 2022 02:14:22 +0000 (+0900)
Subject: modprobe: fix the NULL-termination of new_argv
X-Git-Tag: v30~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=757b3599236c0fee9e2bb0770eb6b7c84a271276;p=thirdparty%2Fkmod.git

modprobe: fix the NULL-termination of new_argv

The number of new arguments is (i + argc - 1) as it is set to *p_argc
one line below.

The correct location of NULL termination is new_argv[i + argc - 1].

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---

diff --git a/tools/modprobe.c b/tools/modprobe.c
index eed951fb..48b1c8ce 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -744,7 +744,7 @@ static char **prepend_options_from_env(int *p_argc, char **orig_argv)
 	}
 
 	memcpy(new_argv + i, orig_argv + 1, sizeof(char *) * (argc - 1));
-	new_argv[i + argc] = NULL;
+	new_argv[i + argc - 1] = NULL;
 	*p_argc = i + argc - 1;
 
 	return new_argv;