]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
modprobe: fix the NULL-termination of new_argv
authorMasahiro Yamada <masahiroy@kernel.org>
Thu, 10 Feb 2022 02:14:22 +0000 (11:14 +0900)
committerLucas De Marchi <lucas.demarchi@intel.com>
Mon, 4 Apr 2022 15:14:40 +0000 (08:14 -0700)
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>
tools/modprobe.c

index eed951fbbb801d44c9c06b9bd0e4d49541bbc73e..48b1c8ceb78dd3e1da995c4f0b056f6d7918dfb5 100644 (file)
@@ -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;