commit: 16ff113dbf5858609ba4b77581c10eb5430c1264 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 28 03:39:18 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 28 03:39:18 2023 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=16ff113d
11.4.0: drop upstreamed 77_all_driver_environ_putenv_PR106624.patch Signed-off-by: Sam James <sam <AT> gentoo.org> .../77_all_driver_environ_putenv_PR106624.patch | 44 ---------------------- 11.4.0/gentoo/README.history | 3 ++ 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/11.4.0/gentoo/77_all_driver_environ_putenv_PR106624.patch b/11.4.0/gentoo/77_all_driver_environ_putenv_PR106624.patch deleted file mode 100644 index baad63a..0000000 --- a/11.4.0/gentoo/77_all_driver_environ_putenv_PR106624.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 <siarh...@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.c (driver::detect_jobserver): Allocate storage xputenv() - argument using xstrdup(). ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -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/11.4.0/gentoo/README.history b/11.4.0/gentoo/README.history index bf891fa..5c06066 100644 --- a/11.4.0/gentoo/README.history +++ b/11.4.0/gentoo/README.history @@ -1,3 +1,6 @@ +8 28 Jan 2022 + - 77_all_driver_environ_putenv_PR106624.patch + 7 23 Jan 2022 - 26_all_enable-cet.patch + 77_all_driver_environ_putenv_PR106624.patch
