From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 11.4.0/gentoo/
Date: Mon, 23 Jan 2023 00:35:27 +0000 (UTC) [thread overview]
Message-ID: <1674434120.3efe77f935c0d12b9bcc869bca60669e12a0c0ad.sam@gentoo> (raw)
commit: 3efe77f935c0d12b9bcc869bca60669e12a0c0ad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 00:27:56 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=3efe77f9
11.4.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 ++++++++++++++++++++++
11.4.0/gentoo/README.history | 3 +-
2 files changed, 46 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..baad63a
--- /dev/null
+++ b/11.4.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 <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.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 1f5565d..bf891fa 100644
--- a/11.4.0/gentoo/README.history
+++ b/11.4.0/gentoo/README.history
@@ -1,5 +1,6 @@
-7 22 Jan 2022
+7 23 Jan 2022
- 26_all_enable-cet.patch
+ + 77_all_driver_environ_putenv_PR106624.patch
6 7 Jan 2022
- 77_all_configure-c89.patch
next reply other threads:[~2023-01-23 0:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 0:35 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-09 13:49 [gentoo-commits] proj/gcc-patches:master commit in: 11.4.0/gentoo/ Sam James
2023-12-06 10:52 Sam James
2023-12-02 5:28 Sam James
2023-05-05 2:37 Sam James
2023-04-27 23:56 Sam James
2023-01-28 5:13 Sam James
2023-01-23 0:35 Sam James
2023-01-07 7:47 Sam James
2022-12-17 4:54 Sam James
2022-12-17 4:54 Sam James
2022-12-17 4:54 Sam James
2022-11-20 0:25 Sam James
2022-08-22 2:14 Sam James
2022-05-22 23:16 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1674434120.3efe77f935c0d12b9bcc869bca60669e12a0c0ad.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox