Skip to content

Backport fix of CVE-2024-24576 #123683

New issue

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

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

Already on GitHub? # to your account

Merged
merged 5 commits into from
Apr 9, 2024

Conversation

pietroalbini
Copy link
Member

@rustbot rustbot added O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Apr 9, 2024
@pietroalbini
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Collaborator

bors commented Apr 9, 2024

📌 Commit 10e7bfb has been approved by pietroalbini

It is now in the queue for this repository.

@bors 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 Apr 9, 2024
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 9, 2024
@pietroalbini
Copy link
Member Author

Backported a fix for the tidy issue we saw in #123681 (comment).

@bors r+ p=100

@bors
Copy link
Collaborator

bors commented Apr 9, 2024

📌 Commit 2f24f17 has been approved by pietroalbini

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Apr 9, 2024

⌛ Testing commit 2f24f17 with merge 8b2459c...

@bors
Copy link
Collaborator

bors commented Apr 9, 2024

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing 8b2459c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 9, 2024
@bors bors merged commit 8b2459c into rust-lang:master Apr 9, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 9, 2024
@pietroalbini pietroalbini deleted the pa-cve-2024-24576-nightly branch April 9, 2024 22:01
@bors bors mentioned this pull request Apr 9, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8b2459c): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.5% [0.5%, 0.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.3% [2.3%, 2.3%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.287s -> 673.348s (0.16%)
Artifact size: 318.40 MiB -> 318.36 MiB (-0.01%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants