[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec #55611

alexcrichton · 2018-11-02T14:11:11Z

This is a backport of the following PRs:

rust-highfive · 2018-11-02T14:11:16Z

r? @aidanhs

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2018-11-02T14:11:17Z

⚠️ Warning ⚠️

Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

alexcrichton · 2018-11-05T16:10:10Z

r? @Mark-Simulacrum

This commit moves a number of our encrypted credentials stored in configuration files in this repository to env vars on the web UI. This will hopefully make it easier to rotate credentials in the future as well as quickly change them if the need arises. (quicker than landing a PR that is). This also updates the travis deployment process to always use the `aws` command line tool which we're already installing on Linux and should enable us to avoid all `dpl` gem issues as well as have greater control over what's going where.

alexcrichton · 2018-11-06T15:02:24Z

I've also included #55304 to help switch over our deploy credentials.

ping r? @Mark-Simulacrum or @pietroalbini

pietroalbini · 2018-11-06T15:10:53Z

@bors r+ p=1

bors · 2018-11-06T15:10:55Z

📌 Commit dc86ac9 has been approved by pietroalbini

pietroalbini · 2018-11-06T15:12:26Z

Uh, wait, the actual backport is missing?

@bors r-

…mmand::exec Instead, pass the environment to execvpe, so the kernel can apply it directly to the new process. This avoids a use-after-free in the case where exec'ing the new process fails for any reason, as well as a race condition if there are other threads alive during the exec.

alexcrichton · 2018-11-06T15:19:18Z

@bors: r=pietroalbini

er yes, I didn't expect this branch hadn't been looked at yet...

bors · 2018-11-06T15:19:19Z

📌 Commit a12b62e has been approved by pietroalbini

bors · 2018-11-06T15:55:38Z

⌛ Testing commit a12b62e with merge c4d00167c14f4feecfc9fa94d862765d578e9f8c...

bors · 2018-11-06T18:58:23Z

💔 Test failed - status-appveyor

alexcrichton · 2018-11-06T19:02:40Z

@bors: retry

3 hr timeout

bors · 2018-11-07T16:22:14Z

📌 Commit 39fa89b has been approved by alexcrichton

bors · 2018-11-07T22:06:20Z

⌛ Testing commit 39fa89b with merge 00b9ddb...

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec This is a backport of the following PRs: * #55359 * #55569 * #55304

bors · 2018-11-08T01:10:04Z

💔 Test failed - status-appveyor

Fix the recent spurious 3 hour timeouts.

This should allow the timings be more balanced.

alexcrichton · 2018-11-08T01:58:37Z

@bors: r+

bors · 2018-11-08T01:58:38Z

📌 Commit 7fe9f76 has been approved by alexcrichton

bors · 2018-11-08T05:44:25Z

⌛ Testing commit 7fe9f76 with merge 6a475253ef1aa602cc40fdb450f5b8e1dc05960d...

bors · 2018-11-08T06:52:23Z

💔 Test failed - status-travis

rust-highfive · 2018-11-08T06:52:24Z

The job dist-various-1 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:04:42] CC_armebv7r_none_eabi=arm-none-eabi-gcc
[01:04:42] S=/checkout
[01:04:42] _=/bin/sh
[01:04:42] TOOLSTATE_REPO_ACCESS_TOKEN=[secure]
[01:04:42] TRAVIS=true
[01:04:42] RUST_RELEASE_CHANNEL=beta
[01:04:42] PATH=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
[01:04:42] RUN_MAKE_TARGETS=thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf
[01:04:42] RUSTC=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc
[01:04:42] RUST_BUILD_STAGE=stage2-thumbv6m-none-eabi
[01:04:42] BOOTSTRAP_PYTHON=/usr/bin/python2.7
[01:04:42] SCRIPT=python2.7 ../x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf src/test/run-make &&       python2.7 ../x.py dist --target asmjs-unknown-emscripten,wasm32-unknown-emscripten,x86_64-rumprun-netbsd,mips-unknown-linux-musl,mipsel-unknown-linux-musl,arm-unknown-linux-musleabi,arm-unknown-linux-musleabihf,armv5te-unknown-linux-gnueabi,armv5te-unknown-linux-musleabi,armv7-unknown-linux-musleabihf,aarch64-unknown-linux-musl,sparc64-unknown-linux-gnu,x86_64-unknown-redox,thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf,riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf,armebv7r-none-eabi,armebv7r-none-eabihf,armv7r-none-eabi,armv7r-none-eabihf
[01:04:42] AR=ar
[01:04:42] TRAVIS_BRANCH=auto
[01:04:42] RUSTC_BOOTSTRAP=1
[01:04:42] HOST_RPATH_DIR=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib
[01:04:42] SCCACHE_BUCKET=rust-lang-ci-sccache2
[01:04:42] PWD=/checkout/obj
[01:04:42] CI_JOB_NAME=dist-various-1
[01:04:42] TARGET_RPATH_DIR=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/thumbv6m-none-eabi/lib
[01:04:42] LD_LIB_PATH_ENVVAR=LD_LIBRARY_PATH
[01:04:42] PYTHON=/usr/bin/python2.7
[01:04:42] HOME=/home/user
[01:04:42] LD_LIBRARY_PATH=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib
[01:04:42] HOSTNAME=2229b40746a0
[01:04:42] CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc
[01:04:42] SHLVL=2
[01:04:42] CC= 
[01:04:42] BUILD_DIR=/checkout/obj/build
[01:04:42] BUILD_DIR=/checkout/obj/build
[01:04:42] RUST_TEST_TMPDIR=/checkout/obj/build/tmp
[01:04:42] LLVM_CXXFLAGS=
[01:04:42] RUSTFLAGS=--cap-lints=allow
[01:04:42] STAGING_DIR=/tmp
[01:04:42] TMPDIR=/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m
[01:04:42] TARGETS=asmjs-unknown-emscripten,wasm32-unknown-emscripten,x86_64-rumprun-netbsd,mips-unknown-linux-musl,mipsel-unknown-linux-musl,arm-unknown-linux-musleabi,arm-unknown-linux-musleabihf,armv5te-unknown-linux-gnueabi,armv5te-unknown-linux-musleabi,armv7-unknown-linux-musleabihf,aarch64-unknown-linux-musl,sparc64-unknown-linux-gnu,x86_64-unknown-redox,thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf,riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf,armebv7r-none-eabi,armebv7r-none-eabihf,armv7r-none-eabi,armv7r-none-eabihf
[01:04:42] RUST_CONFIGURE_ARGS=--musl-root-armv5te=/musl-armv5te       --musl-root-arm=/musl-arm       --musl-root-armhf=/musl-armhf       --musl-root-armv7=/musl-armv7       --musl-root-aarch64=/musl-aarch64       --musl-root-mips=/musl-mips       --musl-root-mipsel=/musl-mipsel       --enable-emscripten       --disable-docs --set build.print-step-timings --enable-verbose-tests --enable-sccache --disable-manage-submodules --enable-locked-deps --enable-cargo-native-static --disable-dist-src --release-channel=beta --enable-llvm-static-stdcpp --set rust.remap-debuginfo --enable-missing-tools
[01:04:42] MAKEFLAGS=
[01:04:42] MFLAGS=
[01:04:42] BOOTSTRAP_PARENT_ID=1052
[01:04:42] BOOTSTRAP_PARENT_ID=1052
[01:04:42] __COMPAT_LAYER=RunAsInvoker
[01:04:42] CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc
[01:04:42] BUILD=x86_64-unknown-linux-gnu
[01:04:42] CXX= 
[01:04:42] AWS_ACCESS_KEY_ID=[secure]
[01:04:42] CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc
[01:04:42] CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc
[01:04:42] CARGO_HOME=/cargo
[01:04:42] RUSTC_LINKER=arm-none-eabi-gcc
[01:04:42] SCCACHE_REGION=us-west-1
[01:04:42] CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc
[01:04:42] LLVM_COMPONENTS=
[01:04:42] TERM=xterm
[01:04:42] MAKELEVEL=1
[01:04:42] mkdir -p /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m
[01:04:42] cd /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m && rm -rf cortex-m
[01:04:42] cd /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m && bash -x /checkout/src/test/run-make/thumb-none-cortex-m/../git_clone_sha1.sh cortex-m https://github.com/rust-embedded/cortex-m a448e9156e2cb1e556e5441fd65426952ef4b927 
[01:04:42] Makefile:31: recipe for target 'all' failed
[01:04:42] 
[01:04:42] ------------------------------------------
[01:04:42] stderr:
[01:04:42] stderr:
[01:04:42] ------------------------------------------
[01:04:42] + PROJECT_NAME=cortex-m
[01:04:42] + URL=https://github.com/rust-embedded/cortex-m
[01:04:42] + SHA1=a448e9156e2cb1e556e5441fd65426952ef4b927
[01:04:42] + git clone https://github.com/rust-embedded/cortex-m cortex-m
[01:04:42] Cloning into 'cortex-m'...
[01:04:42] fatal: unable to access 'https://github.com/rust-embedded/cortex-m/': Could not resolve host: github.com
[01:04:42] + err_exit
[01:04:42] + echo ERROR:
[01:04:42] + exit 1
[01:04:42] make: *** [all] Error 1
[01:04:42] ------------------------------------------
[01:04:42] 
[01:04:42] thread '[run-make] run-make/thumb-none-cortex-m' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3284:9
[01:04:42] note: Run with `RUST_BACKTRACE=1` for a backtrace.
---
[01:04:42] 
[01:04:42] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:503:22
[01:04:42] 
[01:04:42] 
[01:04:42] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/thumbv6m-none-eabi/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-make" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make" "--stage-id" "stage2-thumbv6m-none-eabi" "--mode" "run-make" "--target" "thumbv6m-none-eabi" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "arm-none-eabi-gcc" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/thumbv6m-none-eabi/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--llvm-version" "8.0.0svn\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:04:42] 
[01:04:42] 
[01:04:42] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf src/test/run-make
[01:04:42] Build completed unsuccessfully in 0:58:12
---
travis_time:end:013250c3:start=1541659846653435522,finish=1541659846666376666,duration=12941144
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0395efc2
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:06bde400
travis_time:start:06bde400
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:15a65eb5
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

alexcrichton · 2018-11-08T14:20:08Z

@bors: retry

Good ol' network failures

kennytm · 2018-11-08T17:43:48Z

@bors p=172

bors · 2018-11-08T19:40:15Z

⌛ Testing commit 7fe9f76 with merge bf00632...

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec This is a backport of the following PRs: * #55359 * #55569 * #55304 * #55661

bors · 2018-11-08T22:25:07Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing bf00632 to beta...

rust-highfive assigned aidanhs Nov 2, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 2, 2018

rust-highfive assigned Mark-Simulacrum and unassigned aidanhs Nov 5, 2018

alexcrichton force-pushed the beta-next branch from 9e86e06 to dc86ac9 Compare November 6, 2018 15:01

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 6, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 7, 2018

bors added a commit that referenced this pull request Nov 7, 2018

Auto merge of #55611 - alexcrichton:beta-next, r=alexcrichton

00b9ddb

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec This is a backport of the following PRs: * #55359 * #55569 * #55304

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 8, 2018

kennytm added 2 commits November 7, 2018 17:58

Ensure --exclude is checked against PathSet::Suite

df88246

Fix the recent spurious 3 hour timeouts.

Move a few more tests into the appveyor-subset-2.

7fe9f76

This should allow the timings be more balanced.

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 8, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 8, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 8, 2018

alex mentioned this pull request Nov 8, 2018

Regression in Command::exec's PATH resolution #55775

Closed

bors added a commit that referenced this pull request Nov 8, 2018

Auto merge of #55611 - alexcrichton:beta-next, r=alexcrichton

bf00632

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec This is a backport of the following PRs: * #55359 * #55569 * #55304 * #55661

bors merged commit 7fe9f76 into rust-lang:beta Nov 8, 2018

alexcrichton deleted the beta-next branch November 8, 2018 23:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec #55611

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec #55611

alexcrichton commented Nov 2, 2018 •

edited

Loading

rust-highfive commented Nov 2, 2018

rust-highfive commented Nov 2, 2018

alexcrichton commented Nov 5, 2018

alexcrichton commented Nov 6, 2018

pietroalbini commented Nov 6, 2018

bors commented Nov 6, 2018

pietroalbini commented Nov 6, 2018

alexcrichton commented Nov 6, 2018

bors commented Nov 6, 2018

bors commented Nov 6, 2018

bors commented Nov 6, 2018

alexcrichton commented Nov 6, 2018

bors commented Nov 7, 2018

bors commented Nov 7, 2018

bors commented Nov 8, 2018

alexcrichton commented Nov 8, 2018

bors commented Nov 8, 2018

bors commented Nov 8, 2018

bors commented Nov 8, 2018

rust-highfive commented Nov 8, 2018

alexcrichton commented Nov 8, 2018

kennytm commented Nov 8, 2018

bors commented Nov 8, 2018

bors commented Nov 8, 2018

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec #55611

[beta] Fixes #46775 -- don't mutate the process's environment in Command::exec #55611

Conversation

alexcrichton commented Nov 2, 2018 • edited Loading

rust-highfive commented Nov 2, 2018

rust-highfive commented Nov 2, 2018

alexcrichton commented Nov 5, 2018

alexcrichton commented Nov 6, 2018

pietroalbini commented Nov 6, 2018

bors commented Nov 6, 2018

pietroalbini commented Nov 6, 2018

alexcrichton commented Nov 6, 2018

bors commented Nov 6, 2018

bors commented Nov 6, 2018

bors commented Nov 6, 2018

alexcrichton commented Nov 6, 2018

bors commented Nov 7, 2018

bors commented Nov 7, 2018

bors commented Nov 8, 2018

alexcrichton commented Nov 8, 2018

bors commented Nov 8, 2018

bors commented Nov 8, 2018

bors commented Nov 8, 2018

rust-highfive commented Nov 8, 2018

alexcrichton commented Nov 8, 2018

kennytm commented Nov 8, 2018

bors commented Nov 8, 2018

bors commented Nov 8, 2018

alexcrichton commented Nov 2, 2018 •

edited

Loading