Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc: 1.29.0 -> 1.29.1 #47649

Merged
merged 2 commits into from Oct 3, 2018
Merged

rustc: 1.29.0 -> 1.29.1 #47649

merged 2 commits into from Oct 3, 2018

Conversation

andir
Copy link
Member

@andir andir commented Oct 2, 2018

Motivation for this change

Fixing a security sensitive bug in the rust stdlib.

From the changelog:

  • The standard library's str::repeat function contained an out of bounds write
    caused by an integer overflow. This has been fixed by deterministically
    panicking when an overflow happens.

This change should not break anything that wasn't broken on 1.29.0 before. I have been rebuilding large portions of nixpkgs on the current staging head and didn't encounter many issues.

We should probably provide backports to 18.03 & 18.03 following the patch proposed on the original announcement mail.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: rustc

Partial log (click to expand)

cannot build derivation '/nix/store/ggf8cp4pzbc1g3l7aryrmcnmlrda57sn-xmlto-0.0.28.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/y760i4bbln7cdiq7fmnlag5x4ivjzn23-opensp-1.5.2.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/gk9y8r5hxp1flr1fbzhxk3pghlvy3swq-swift-corefoundation.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/ravvpxxzcfjq22wrhmh340qx4bb5w0il-apple-framework-IOKit.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/8pqgq2lh74npwfa92hspp6z9jcws15s2-docbook2X-0.8.8.drv': 16 dependencies couldn't be built
cannot build derivation '/nix/store/3xcx7zsc3nf4qqzx01d3mb3n1315f66p-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/pc51qs0v2xrzh6fazzkccpj0l3gqmsj0-git-2.19.0.drv': 29 dependencies couldn't be built
cannot build derivation '/nix/store/3v54z42cfc7dfz40r47knwh683rafyr8-rustc-bootstrap-1.28.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/xs36ffkpkp5q1cs92ilnb9a0qrpyhga1-rustc-1.29.1.drv': 16 dependencies couldn't be built
error: build of '/nix/store/xs36ffkpkp5q1cs92ilnb9a0qrpyhga1-rustc-1.29.1.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: rustc

Partial log (click to expand)

   Compiling rustc-rayon v0.1.1
   Compiling rustc_data_structures v0.0.0 (file:///build/rustc-1.29.1-src/src/librustc_data_structures)
   Compiling arena v0.0.0 (file:///build/rustc-1.29.1-src/src/libarena)
   Compiling syntax_pos v0.0.0 (file:///build/rustc-1.29.1-src/src/libsyntax_pos)
   Compiling rustc_errors v0.0.0 (file:///build/rustc-1.29.1-src/src/librustc_errors)
   Compiling proc_macro v0.0.0 (file:///build/rustc-1.29.1-src/src/libproc_macro)
   Compiling syntax_ext v0.0.0 (file:///build/rustc-1.29.1-src/src/libsyntax_ext)
   Compiling rustc_typeck v0.0.0 (file:///build/rustc-1.29.1-src/src/librustc_typeck)
building of '/nix/store/bg9j1jh39id3vmyal51mkh5nskdnwka9-rustc-1.29.1.drv' timed out after 3600 seconds
error: build of '/nix/store/bg9j1jh39id3vmyal51mkh5nskdnwka9-rustc-1.29.1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rustc

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/71yg017bl9bqpvvixfacyg2nkwqgyiv6-rustc-1.29.1-man
gzipping man pages under /nix/store/71yg017bl9bqpvvixfacyg2nkwqgyiv6-rustc-1.29.1-man/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/71yg017bl9bqpvvixfacyg2nkwqgyiv6-rustc-1.29.1-man
checking for references to /build in /nix/store/71yg017bl9bqpvvixfacyg2nkwqgyiv6-rustc-1.29.1-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/amgxg5b07wg2jjrd1hg178y37iwshvxm-rustc-1.29.1-doc
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/amgxg5b07wg2jjrd1hg178y37iwshvxm-rustc-1.29.1-doc
checking for references to /build in /nix/store/amgxg5b07wg2jjrd1hg178y37iwshvxm-rustc-1.29.1-doc...
/nix/store/62him3syh1wkcjjwi21gnxj15lzwv3g3-rustc-1.29.1

@Mic92
Copy link
Member

Mic92 commented Oct 2, 2018

@andir please merge this together with #47556

@Mic92
Copy link
Member

Mic92 commented Oct 2, 2018

When backporting to 18.03 don't forget to also disable the checkPhase there as well.

@LnL7
Copy link
Member

LnL7 commented Oct 2, 2018

Maybe this should go straight to staging-next, since it's security sensitive.

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Darwin builds look good.

@LnL7
Copy link
Member

LnL7 commented Oct 2, 2018

staging-next has been merged in the meantime so no need to change the branch anymore.

@andir
Copy link
Member Author

andir commented Oct 2, 2018

@Mic92 I added those commits to this branch.

Let me know if this looks good or if this can be merged :-)

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rustc

Partial log (click to expand)

/nix/store/62him3syh1wkcjjwi21gnxj15lzwv3g3-rustc-1.29.1

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: rustc

Partial log (click to expand)

make[3]: Entering directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
Scanning dependencies of target LLVMAArch64Disassembler
make[3]: Leaving directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
make[3]: Entering directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
[ 71%] Building CXX object lib/Target/AArch64/Disassembler/CMakeFiles/LLVMAArch64Disassembler.dir/AArch64Disassembler.cpp.o
[ 71%] Building CXX object lib/Target/ARM/CMakeFiles/LLVMARMCodeGen.dir/ARMTargetTransformInfo.cpp.o
[ 71%] Building CXX object lib/Target/ARM/CMakeFiles/LLVMARMCodeGen.dir/MLxExpansionPass.cpp.o
[ 71%] Building CXX object lib/Target/X86/CMakeFiles/LLVMX86CodeGen.dir/X86TargetMachine.cpp.o
building of '/nix/store/bg9j1jh39id3vmyal51mkh5nskdnwka9-rustc-1.29.1.drv' timed out after 1800 seconds
error: build of '/nix/store/bg9j1jh39id3vmyal51mkh5nskdnwka9-rustc-1.29.1.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: rustc

Partial log (click to expand)

cannot build derivation '/nix/store/l1sp2v620mgvmg4y2pgmrzg6ycr0ndsn-xmlto-0.0.28.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/nb3p1pc8kjn64i1hj6lf5xrn1kzbq9bk-opensp-1.5.2.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/lgvd6crk3gbw3h7n16lgf36cbgxwdgdn-swift-corefoundation.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/biqrvwkxlx0rrvyxjwb61rzi5d33mwh0-apple-framework-IOKit.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/cbwjdv23b2zh2vfgjzkg676z2n04cbrh-docbook2X-0.8.8.drv': 16 dependencies couldn't be built
cannot build derivation '/nix/store/n4sfjl84a64483fkbmfb6hwydmii1rvk-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/06vry6q4fxcpc85zqfg3wwh1s46pcknq-git-2.19.0.drv': 29 dependencies couldn't be built
cannot build derivation '/nix/store/pib6d1l56gjj5ssp691p1p8nhdlsln46-rustc-bootstrap-1.28.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/mlwmqvjfpq5f5kpahj1l02andwpljixx-rustc-1.29.1.drv': 15 dependencies couldn't be built
error: build of '/nix/store/mlwmqvjfpq5f5kpahj1l02andwpljixx-rustc-1.29.1.drv' failed

@Mic92
Copy link
Member

Mic92 commented Oct 3, 2018

@andir they can be actually squashed into one commit apart from that it looks good to me.

andir and others added 2 commits October 3, 2018 16:26
From the changelog:

- The standard library's `str::repeat` function contained an out of bounds write
  caused by an integer overflow. This has been fixed by deterministically
  panicking when an overflow happens.
@andir
Copy link
Member Author

andir commented Oct 3, 2018

@Mic92 Done.

@andir andir merged commit 78adf2c into NixOS:staging Oct 3, 2018
@andir andir deleted the staging-rustc-1.29.1 branch October 3, 2018 15:13
@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: rustc

Partial log (click to expand)

cannot build derivation '/nix/store/l1sp2v620mgvmg4y2pgmrzg6ycr0ndsn-xmlto-0.0.28.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/nb3p1pc8kjn64i1hj6lf5xrn1kzbq9bk-opensp-1.5.2.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/lgvd6crk3gbw3h7n16lgf36cbgxwdgdn-swift-corefoundation.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/biqrvwkxlx0rrvyxjwb61rzi5d33mwh0-apple-framework-IOKit.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/cbwjdv23b2zh2vfgjzkg676z2n04cbrh-docbook2X-0.8.8.drv': 16 dependencies couldn't be built
cannot build derivation '/nix/store/n4sfjl84a64483fkbmfb6hwydmii1rvk-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/06vry6q4fxcpc85zqfg3wwh1s46pcknq-git-2.19.0.drv': 29 dependencies couldn't be built
cannot build derivation '/nix/store/pib6d1l56gjj5ssp691p1p8nhdlsln46-rustc-bootstrap-1.28.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/mlwmqvjfpq5f5kpahj1l02andwpljixx-rustc-1.29.1.drv': 16 dependencies couldn't be built
error: build of '/nix/store/mlwmqvjfpq5f5kpahj1l02andwpljixx-rustc-1.29.1.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rustc

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/rbpwrw2lm25avxzjmrhbmpnxk3lz51qf-rustc-1.29.1-man
gzipping man pages under /nix/store/rbpwrw2lm25avxzjmrhbmpnxk3lz51qf-rustc-1.29.1-man/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/rbpwrw2lm25avxzjmrhbmpnxk3lz51qf-rustc-1.29.1-man
checking for references to /build in /nix/store/rbpwrw2lm25avxzjmrhbmpnxk3lz51qf-rustc-1.29.1-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/2hj4dr36halfd1dn95nrmmpfcahxm6ka-rustc-1.29.1-doc
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/2hj4dr36halfd1dn95nrmmpfcahxm6ka-rustc-1.29.1-doc
checking for references to /build in /nix/store/2hj4dr36halfd1dn95nrmmpfcahxm6ka-rustc-1.29.1-doc...
/nix/store/sazlp6x75286c9lnw01qd5xsspdx125v-rustc-1.29.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rustc

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/b136lnmbssxq0qbwxcznr7a63vyssqyd-rustc-1.29.1-man
gzipping man pages under /nix/store/b136lnmbssxq0qbwxcznr7a63vyssqyd-rustc-1.29.1-man/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/b136lnmbssxq0qbwxcznr7a63vyssqyd-rustc-1.29.1-man
checking for references to /build in /nix/store/b136lnmbssxq0qbwxcznr7a63vyssqyd-rustc-1.29.1-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/dbbbfxc7vhcnyhsjdjw1pxpf02hxfbaj-rustc-1.29.1-doc
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/dbbbfxc7vhcnyhsjdjw1pxpf02hxfbaj-rustc-1.29.1-doc
checking for references to /build in /nix/store/dbbbfxc7vhcnyhsjdjw1pxpf02hxfbaj-rustc-1.29.1-doc...
/nix/store/4nbhw0wz5fvxa2xszyb4x20wdq0qgpk6-rustc-1.29.1

@Mic92
Copy link
Member

Mic92 commented Oct 3, 2018

@andir did you backport this to staging-18.09?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants