commit: 2d7f885131fa8fba81d0a6f558ba58044b9ee726 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 23 00:31:27 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 23 00:35:20 2023 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=2d7f8851
10.5.0: backport driver environ corruption fix Bug: https://bugs.gentoo.org/885501 Signed-off-by: Sam James <sam <AT> gentoo.org> .../77_all_driver_environ_putenv_PR106624.patch | 44 ++++++++++++++++++++++ 10.5.0/gentoo/README.history | 3 ++ 2 files changed, 47 insertions(+) diff --git a/10.5.0/gentoo/77_all_driver_environ_putenv_PR106624.patch b/10.5.0/gentoo/77_all_driver_environ_putenv_PR106624.patch new file mode 100644 index 0000000..baad63a --- /dev/null +++ b/10.5.0/gentoo/77_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 <[email protected]> +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/10.5.0/gentoo/README.history b/10.5.0/gentoo/README.history index db63084..d721532 100644 --- a/10.5.0/gentoo/README.history +++ b/10.5.0/gentoo/README.history @@ -1,3 +1,6 @@ +4 23 Jan 2022 + + 77_all_driver_environ_putenv_PR106624.patch + 3 17 Dec 2022 U 35_all_tar_libstdc++-link.patch
