colin/passt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch: Pointer to local outside scope, CWE-562

Browse Source 
Reported by Coverity: if we fail to run the AVX2 version, once
execve() fails, we had already replaced argv[0] with the new
stack-allocated path string, and that's then passed back to
main(). Use a static variable instead.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio
2022-04-05 15:18:25 +02:00
parent 2b1fbf4631
commit 0bf6adc886
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch.c
View File

@@ -22,6 +22,8 @@
* @argv: Arguments from command line * @argv: Arguments from command line
*/ */
#ifdef __x86_64__ #ifdef __x86_64__
static char avx2_path[PATH_MAX];
void arch_avx2_exec(char **argv) void arch_avx2_exec(char **argv)
{ {
char *p = strstr(argv[0], ".avx2"); char *p = strstr(argv[0], ".avx2");
@@ -29,11 +31,9 @@ void arch_avx2_exec(char **argv)
if (p) { if (p) {
*p = 0; *p = 0;
} else if (__builtin_cpu_supports("avx2")) { } else if (__builtin_cpu_supports("avx2")) {
char path[PATH_MAX]; snprintf(avx2_path, PATH_MAX, "%s.avx2", argv[0]);
argv[0] = avx2_path;
snprintf(path, PATH_MAX, "%s.avx2", argv[0]); execve(avx2_path, argv, environ);
argv[0] = path;
execve(path, argv, environ);
perror("Can't run AVX2 build, using non-AVX2 version"); perror("Can't run AVX2 build, using non-AVX2 version");
} }
} }