diff mbox series

driver: fix environ corruption after putenv() [PR106624]

Message ID 20220816114857.1632691-1-slyich@gmail.com
State Committed
Commit 2b403297b111c990c331b5bbb6165b061ad2259b
Headers
Series driver: fix environ corruption after putenv() [PR106624] |

Commit Message

Sergei Trofimovich Aug. 16, 2022, 11:48 a.m. UTC 
  From: Sergei Trofimovich <siarheit@google.com>

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 (driver::detect_jobserver): Allocate storage xputenv()
	argument using xstrdup().
---
 gcc/gcc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin Liška Aug. 16, 2022, 11:59 a.m. UTC | #1 
On 8/16/22 13:48, Sergei Trofimovich wrote:
> From: Sergei Trofimovich <siarheit@google.com>
> 
> 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.

Thanks for the patch.

I think it's an obvious fix, please install it.

Martin

> 
> gcc/
> 
> 	PR driver/106624
> 	* gcc (driver::detect_jobserver): Allocate storage xputenv()
> 	argument using xstrdup().
> ---
>  gcc/gcc.cc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/gcc.cc b/gcc/gcc.cc
> index cac11c1a117..75ca0ece1a4 100644
> --- 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.  */
diff mbox series

Patch

diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index cac11c1a117..75ca0ece1a4 100644
--- 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.  */