diff options
| author |   Sam James <sam@gentoo.org> | 2023-01-23 00:23:09 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-01-23 00:35:20 +0000 |
| commit | d3c10f4c409a3b6c07c453af289c5e23420156f1 (patch) | |
| tree | da7f52be6ebf20f474a8a355633f0af492176d32 /12.2.0 | |
| parent | 11.4.0: backport driver environ corruption fix (diff) | |
| download | gcc-patches-d3c10f4c409a3b6c07c453af289c5e23420156f1.tar.gz gcc-patches-d3c10f4c409a3b6c07c453af289c5e23420156f1.tar.bz2 gcc-patches-d3c10f4c409a3b6c07c453af289c5e23420156f1.zip | |
12.2.0: backport driver environ corruption fix
Bug: https://bugs.gentoo.org/885501
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '12.2.0')
| -rw-r--r-- | 12.2.0/gentoo/76_all_driver_environ_putenv_PR106624.patch | 44 | ||||
| -rw-r--r-- | 12.2.0/gentoo/README.history | 3 |
2 files changed, 47 insertions, 0 deletions
diff --git a/12.2.0/gentoo/76_all_driver_environ_putenv_PR106624.patch b/12.2.0/gentoo/76_all_driver_environ_putenv_PR106624.patch new file mode 100644 index 0000000..16fb131 --- /dev/null +++ b/12.2.0/gentoo/76_all_driver_environ_putenv_PR106624.patch @@ -0,0 +1,44 @@ +https://bugs.gentoo.org/885501 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106624 +https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=2b403297b111c990c331b5bbb6165b061ad2259b + +From 2b403297b111c990c331b5bbb6165b061ad2259b Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Tue, 16 Aug 2022 12:35:07 +0100 +Subject: [PATCH 1/1] driver: fix environ corruption after putenv() [PR106624] + +The bug appeared afte r13-2010-g1270ccda70ca09 "Factor out +jobserver_active_p" slightly changed `putenv()` use from allocating +to non-allocating: + + -xputenv (concat ("MAKEFLAGS=", dup, NULL)); + +xputenv (jinfo.skipped_makeflags.c_str ()); + +`xputenv()` (and `putenv()`) don't copy strings and only store the +pointer in the `environ` global table. As a result `environ` got +corrupted as soon as `jinfo.skipped_makeflags` store got deallocated. + +This started causing bootstrap crashes in `execv()` calls: + + xgcc: fatal error: cannot execute '/build/build/./prev-gcc/collect2': execv: Bad address + +The change restores memory allocation for `xputenv()` argument. + +gcc/ + + PR driver/106624 + * gcc.cc (driver::detect_jobserver): Allocate storage xputenv() + argument using xstrdup(). +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -9182,7 +9182,7 @@ driver::detect_jobserver () const + { + jobserver_info jinfo; + if (!jinfo.is_active && !jinfo.skipped_makeflags.empty ()) +- xputenv (jinfo.skipped_makeflags.c_str ()); ++ xputenv (xstrdup (jinfo.skipped_makeflags.c_str ())); + } + + /* Determine what the exit code of the driver should be. */ +-- +2.31.1 diff --git a/12.2.0/gentoo/README.history b/12.2.0/gentoo/README.history index d71d136..e3e0bf4 100644 --- a/12.2.0/gentoo/README.history +++ b/12.2.0/gentoo/README.history @@ -1,3 +1,6 @@ +10 23 Jan 2022 + + 76_all_driver_environ_putenv_PR106624.patch + 9 8 Jan 2022 - 76_all_libsanitizer-implicit-function-decls.patch - 77_all_libiberty-fix-c89-isms-in-configure.patch |