Skip to content

cargo,clippy,rustc,rustfmt: 1.80.1 -> 1.81.0#339854

Merged
alyssais merged 1 commit intoNixOS:stagingfrom
alyssais:rust-1.81
Sep 10, 2024
Merged

cargo,clippy,rustc,rustfmt: 1.80.1 -> 1.81.0#339854
alyssais merged 1 commit intoNixOS:stagingfrom
alyssais:rust-1.81

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Sep 5, 2024 •
edited by emilazy
Loading

Description of changes

Fixes: CVE-2024-24576

Built:

  • fd.aarch64-darwin
  • fd.aarch64-linux
  • fd.x86_64-darwin
  • fd.x86_64-linux
  • firefox.x86_64-linux
  • thunderbird.x86_64-linux

Please help test Darwin.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Sep 5, 2024
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Sep 5, 2024
winterqt
winterqt reviewed Sep 5, 2024
View reviewed changes
@alyssais alyssais changed the base branch from staging-next to staging September 5, 2024 17:35
@ofborg ofborg bot requested review from tjni and winterqt September 5, 2024 18:20
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Sep 5, 2024
@emilazy
Copy link
Member

emilazy commented Sep 5, 2024

Successfully built fd on aarch64-darwin. My local machine is too weird right now to confirm x86_64-darwin.

@emilazy
Copy link
Member

emilazy commented Sep 5, 2024

Confirmed fd on x86_64-darwin too.

@alyssais alyssais marked this pull request as draft September 6, 2024 12:51
@alyssais
Copy link
Member Author

alyssais commented Sep 6, 2024

This breaks fastCross cross compilation. I'm investigating, but worst case we can just disable that, and cross compiling will mean having to compile a whole new rustc again.

@alyssais alyssais marked this pull request as ready for review September 6, 2024 13:16
@alyssais
Copy link
Member Author

alyssais commented Sep 6, 2024

Bisected to rust-lang/rust#127866.

@alyssais
Copy link
Member Author

alyssais commented Sep 6, 2024 •
edited
Loading

One of rust-lang/rust@c3d3d6f, rust-lang/rust@c15469a fixes this. I'll figure out which one tomorrow.

@alyssais
Copy link
Member Author

alyssais commented Sep 7, 2024 •
edited
Loading

It's the latter, so I guess once rust-lang/rust#130034 is merged I'll apply it and we can re-enable fastCross.

@freyacodes freyacodes mentioned this pull request Sep 8, 2024
Closed
13 tasks
@alyssais alyssais merged commit 5f125d5 into NixOS:staging Sep 10, 2024
@alyssais alyssais deleted the rust-1.81 branch September 10, 2024 13:02
@chayleaf
Copy link
Contributor

chayleaf commented Sep 10, 2024

to clarify for anyone else confused about this, this fixes CVE-2024-43402, not CVE-2024-24576 (which got fixed in 1.77.2). Both are Windows-only, so the impact for Nix is zero, or at least very close to zero.

@alyssais
Copy link
Member Author

alyssais commented Sep 10, 2024

Nixpkgs supports building Rust programs for Windows.

@alyssais
Copy link
Member Author

alyssais commented Sep 10, 2024

Sorry for the wrong CVE ID though.

@uncenter uncenter mentioned this pull request Sep 25, 2024
Closed
13 tasks
@Hasnep Hasnep mentioned this pull request Sep 27, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

@figsoda figsoda Awaiting requested review from figsoda

@tjni tjni Awaiting requested review from tjni

@winterqt winterqt Awaiting requested review from winterqt

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@alyssais @emilazy @chayleaf @winterqt