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

Bump libc and fix remove_dir_all on Fuchsia after CVE fix #93351

Merged
merged 1 commit into from
Jan 29, 2022

Conversation

anp
Copy link
Member

@anp anp commented Jan 26, 2022

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.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2022
anp added a commit to anp/libc that referenced this pull request Jan 27, 2022
bors added a commit to rust-lang/libc that referenced this pull request Jan 27, 2022
Release 0.2.115 to crates.io.

Needed by rust-lang/rust#93351.

Should have included this in my prior PR but hadn't finished reading CONTRIBUTING.md. Sorry for the extra traffic!
@anp anp force-pushed the fuchsia-remove-dir-all branch from 5f41ad4 to ac4cf3e Compare January 27, 2022 21:27
@rust-log-analyzer

This comment has been minimized.

@tmandry tmandry changed the title Fix remove_dir_all on Fuchsia after CVE fix. Bump libc and remove_dir_all on Fuchsia after CVE fix Jan 27, 2022
@tmandry tmandry changed the title Bump libc and remove_dir_all on Fuchsia after CVE fix Bump libc and fix remove_dir_all on Fuchsia after CVE fix Jan 27, 2022
@tmandry
Copy link
Member

tmandry commented Jan 27, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 27, 2022

📌 Commit ac4cf3e8ebcb629c9655a78c6a2a55e7d6118435 has been approved by tmandry

@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 Jan 27, 2022
@tmandry
Copy link
Member

tmandry commented Jan 27, 2022

@bors rollup=iffy due to libc bump (probably fine, but there are a lot of commits)

@bors
Copy link
Contributor

bors commented Jan 28, 2022

⌛ Testing commit ac4cf3e8ebcb629c9655a78c6a2a55e7d6118435 with merge 906ec76bee5a5ad501b5f67aa8e7706a9355b1a9...

@bors
Copy link
Contributor

bors commented Jan 28, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 28, 2022
@rust-log-analyzer

This comment has been minimized.

bors added a commit to rust-lang/libc that referenced this pull request Jan 28, 2022
Gate PartialEq and Eq on freebsd objects behind extra_traits

This fixes the failure in rust-lang/rust#93351 (comment).

These derives were recently added in #2565. Other PartialEq/Eq derives in the project (and this file) are all behind the `extra_traits` gate.
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.

Updates std's libc crate to include DT_UNKNOWN for Fuchsia.
@tmandry tmandry force-pushed the fuchsia-remove-dir-all branch from ac4cf3e to 8c9944c Compare January 28, 2022 20:38
@tmandry
Copy link
Member

tmandry commented Jan 28, 2022

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jan 28, 2022

📌 Commit 8c9944c has been approved by tmandry

@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 Jan 28, 2022
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-12 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

running 165 tests
...................................i..............................i...........

command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/mir-opt" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/mir-opt" "--stage-id" "stage2-i686-unknown-linux-gnu" "--suite" "mir-opt" "--mode" "mir-opt" "--target" "i686-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-12/bin/FileCheck" "--nodejs" "/usr/bin/node" "--linker" "cc" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "12.0.0" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes perfjitevents powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"
expected success, got: signal: 11 (core dumped)

Build completed unsuccessfully in 0:01:29

@tmandry
Copy link
Member

tmandry commented Jan 28, 2022

Check failures seem to be from #93384

@bors
Copy link
Contributor

bors commented Jan 29, 2022

⌛ Testing commit 8c9944c with merge ca43894...

@bors bors mentioned this pull request Jan 29, 2022
@bors
Copy link
Contributor

bors commented Jan 29, 2022

☀️ Test successful - checks-actions
Approved by: tmandry
Pushing ca43894 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 29, 2022
@bors bors merged commit ca43894 into rust-lang:master Jan 29, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 29, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ca43894): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@anp anp deleted the fuchsia-remove-dir-all branch February 22, 2022 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants