diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-09-06 14:27:03 +0200 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-09-10 14:22:52 +0200 |
| commit | 1fe2b9ca8a50aaa789d72944b5a91f1d35337adc (patch) | |
| tree | 1d637020bce4fbf6fec6e23092a19b13284e1a1f | |
| parent | 0b79004569e5ce1669136b8c41564c3809730f15 (diff) | |
| download | glibc-1fe2b9ca8a50aaa789d72944b5a91f1d35337adc.tar.gz glibc-1fe2b9ca8a50aaa789d72944b5a91f1d35337adc.tar.xz glibc-1fe2b9ca8a50aaa789d72944b5a91f1d35337adc.zip | |
Fix segfault in maybe_script_execute.
If glibc is built with gcc 8 and -march=z900, the testcase posix/tst-spawn4-compat crashes with a segfault. In function maybe_script_execute, the new_argv array is dynamically initialized on stack with (argc + 1) elements. The function wants to add _PATH_BSHELL as the first argument and writes out of bounds of new_argv. There is an off-by-one because maybe_script_execute fails to count the terminating NULL when sizing new_argv. ChangeLog: * sysdeps/unix/sysv/linux/spawni.c (maybe_script_execute): Increment size of new_argv by one. (cherry picked from commit 28669f86f6780a18daca264f32d66b1428c9c6f1)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/spawni.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 94b8718365..d9e7e6f1d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-09-06 Stefan Liebler <stli@linux.ibm.com> + + * sysdeps/unix/sysv/linux/spawni.c (maybe_script_execute): + Increment size of new_argv by one. + 2018-08-28 Florian Weimer <fweimer@redhat.com> [BZ #23578] diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index cf0213ece5..85239cedbf 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -101,7 +101,7 @@ maybe_script_execute (struct posix_spawn_args *args) ptrdiff_t argc = args->argc; /* Construct an argument list for the shell. */ - char *new_argv[argc + 1]; + char *new_argv[argc + 2]; new_argv[0] = (char *) _PATH_BSHELL; new_argv[1] = (char *) args->file; if (argc > 1) |