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

Define DT_UNKNOWN on Fuchsia. #2654

Merged
merged 1 commit into from
Jan 26, 2022
Merged

Conversation

anp
Copy link
Member

@anp anp commented Jan 26, 2022

It looks like this constant is relied on in the new remove_dir_all logic and we need to reference it to be able to use the CVE fix correctly on Fuchsia.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

Please see the contribution instructions for more information.

@Amanieu
Copy link
Member

Amanieu commented Jan 26, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 26, 2022

📌 Commit af30859 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Jan 26, 2022

⌛ Testing commit af30859 with merge 3063aa1...

@bors
Copy link
Contributor

bors commented Jan 26, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 3063aa1 to master...

@bors bors merged commit 3063aa1 into rust-lang:master Jan 26, 2022
@anp anp deleted the fuchsia-dt-unknown branch January 27, 2022 00:15
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2022
Bump libc and fix remove_dir_all on Fuchsia after CVE fix

With the previous `is_dir` impl, we would attempt to unlink
a directory in the None branch, but Fuchsia supports returning
ENOTEMPTY from unlinkat() without the AT_REMOVEDIR flag because
we don't currently differentiate unlinking files and directories
by default.

On the Fuchsia side I've opened https://fxbug.dev/92273 to discuss
whether this is the correct behavior, but it doesn't seem like
addressing the error code is necessary to make our tests happy.

Depends on rust-lang/libc#2654 since we
apparently haven't needed to reference DT_UNKNOWN before this.
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.

4 participants