bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #93351 - anp:fuchsia-remove-dir-all, r=tmandry

Browse source 
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 https://github.com/rust-lang/libc/pull/2654 since we
apparently haven't needed to reference DT_UNKNOWN before this.
This commit is contained in:
bors 2022-01-29 09:01:01 +00:00
commit ca43894e0e
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/sys/unix/fs.rs
View file

@ -1653,7 +1653,6 @@ mod remove_dir_impl {
target_os = "illumos",
target_os = "haiku",
target_os = "vxworks",
target_os = "fuchsia"
))]
fn is_dir(_ent: &DirEntry) -> Option<bool> {
None
@ -1664,7 +1663,6 @@ mod remove_dir_impl {
target_os = "illumos",
target_os = "haiku",
target_os = "vxworks",
target_os = "fuchsia"
)))]
fn is_dir(ent: &DirEntry) -> Option<bool> {
match ent.entry.d_type {