feat: Expand safe directory traversal to all Unix platforms and fix related type conversions. #9792

abendrothj · 2025-12-23T11:11:57Z

feat: enable safe traversal on all Unix platforms

Expands the safe_traversal module support from target_os = "linux" to unix, enabling security improvements (specifically preventing TOCTOU races) on macOS and BSDs.

Changes:

Feature Guards: Replaced #[cfg(target_os = "linux")] with #[cfg(unix)] in uucore, du, chmod, and rm.
Refactoring: Renamed src/uu/rm/src/platform/linux.rs to unix.rs to reflect the broader platform support.
Type Safety: Added necessary type casts in safe_traversal.rs and du.rs to handle platform-specific differences in libc types (e.g., mode_t).

Verification:
Verified with cargo test on macOS.

Closes #9747

…elated type conversions.

github-actions · 2025-12-23T12:48:03Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)

sylvestre

plenty of jobs are failing, please fix them

- Use 'as u64' casts with clippy::unnecessary_cast suppression for st_nlink and st_ino to handle platform-specific type differences - Add TOCTOU (time-of-check time-of-use) to cspell dictionary Fixes compilation errors on FreeBSD, OpenBSD, and Android where libc types differ from Linux/macOS (st_nlink is u16, st_ino is u32). The cast is unnecessary on some platforms but required on others, hence the clippy suppression.

Resolved merge conflict in src/uu/du/src/du.rs by keeping the unix cfg guard (not target_os = "linux") to align with the PR's goal of expanding safe_traversal to all Unix platforms.

sylvestre · 2025-12-27T15:21:02Z

Still a few job failures

github-actions · 2025-12-27T15:31:09Z

GNU testsuite comparison:

GNU test failed: tests/cp/cp-mv-enotsup-xattr. tests/cp/cp-mv-enotsup-xattr is passing on 'main'. Maybe you have to rebase?
Note: The gnu test tests/csplit/csplit-io-err was skipped on 'main' but is now failing.

This commit addresses compilation errors and test failures on macOS and BSD platforms introduced by the safe_traversal expansion to Unix platforms. **SELinux Platform Guards (8 files):** The SELinux module in uucore is Linux-only, gated behind `#[cfg(all(target_os = "linux", feature = "selinux"))]`. However, code was only checking `#[cfg(feature = "selinux")]`, causing compilation failures on macOS/BSDs where uucore::selinux doesn't exist. Fixed by updating all SELinux feature checks from: `#[cfg(feature = "selinux")]` to: `#[cfg(all(feature = "selinux", target_os = "linux"))]` Modified files: - src/uu/cp/src/cp.rs (2 locations) - src/uu/id/src/id.rs (4 locations) - src/uu/install/src/install.rs (17 locations) - src/uu/mkdir/src/mkdir.rs (1 location) - src/uu/mkfifo/src/mkfifo.rs (1 location) - src/uu/mknod/src/mknod.rs (1 location) - src/uu/stat/src/stat.rs (2 locations) **Type Conversion Fix:** On macOS, `libc::mode_t` is `u16` while `metadata.permissions().mode()` returns `u32`, causing a type mismatch in rm's safe_traversal code. Fixed in src/uu/rm/src/platform/unix.rs:320 by adding explicit cast: `initial_mode as libc::mode_t` **Test Fix:** Updated test_chmod_recursive to expect consistent error messages across all Unix platforms. With safe_traversal now enabled universally on Unix, the detailed error format "cannot access 'z': Permission denied" is used on all platforms, not just Linux. Modified: tests/by-util/test_chmod.rs **Verification:** - ✅ All unit tests pass (chmod, du, rm, cp, id, stat, mkdir, mkfifo, mknod, install, uucore) - ✅ All functional tests pass - ✅ cargo build --features feat_os_macos - ✅ cargo build --features feat_os_unix - ✅ cargo clippy (macOS & Unix features) - ✅ cargo fmt --all -- --check - ✅ chmod integration tests (40/40 passed)

github-actions · 2025-12-28T10:07:37Z

GNU testsuite comparison:

GNU test failed: tests/sort/sort-stale-thread-mem. tests/sort/sort-stale-thread-mem is passing on 'main'. Maybe you have to rebase?

Fixes multiple platform-specific type issues in safe_traversal.rs: 1. **Clippy unnecessary_cast warnings** - Add #[allow(clippy::unnecessary_cast)] to dev(), mode(), and rdev() methods. These casts are unnecessary on Linux where types are already u64/u32, but required on macOS/BSD where: - st_dev is i32 (needs cast to u64) - st_mode is u16 (needs cast to u32) - st_rdev is i32 (needs cast to u64) 2. **Android type mismatch** - Cast st_mode to libc::mode_t in file_type() method. On Android, st_mode is u32 but libc::mode_t is u16, causing compilation failure when passing to FileType::from_mode(). These fixes match the existing pattern already used for st_ino and st_nlink. Resolves: - Style/lint (ubuntu-latest, all, true) - clippy errors - Style and Lint (unix) - OpenBSD clippy errors - Test builds (Android x86/x86_64) - type mismatch errors

…unnecessary)

github-actions · 2025-12-28T11:47:16Z

GNU testsuite comparison:

Congrats! The gnu test tests/tail/assert is no longer failing!

github-actions · 2025-12-28T12:22:05Z

GNU testsuite comparison:

Congrats! The gnu test tests/tail/assert is no longer failing!

…modules & disable safe dir for Redox (assumedly will be handled in another PR but can implement Redox specific version if requested)

…sive_impl and safe_traversal modules

github-actions · 2025-12-28T13:26:12Z

GNU testsuite comparison:

Congrats! The gnu test tests/tail/assert is no longer failing!

- Fix type mismatches in rm's unix.rs by casting libc constants to u16 to match st_mode - Add Redox stubs for safe_traversal to prevent build errors on Redox - Make locale format tests robust: only enforce strict checks on platforms with locale support (Linux, macOS, BSDs) These changes ensure safe directory traversal and related utilities build and test cleanly across all Unix targets, including Redox, and CI passes regardless of locale support.

…safe_remove_dir_recursive_impl

…pe for Android platform

…rations

github-actions · 2025-12-28T14:55:54Z

GNU testsuite comparison:

Congrats! The gnu test tests/tail/assert is no longer failing!

…lity (final huzzah)

github-actions · 2025-12-28T15:25:51Z

GNU testsuite comparison:

Congrats! The gnu test tests/tail/assert is no longer failing!

github-actions · 2025-12-31T10:07:48Z

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

…ions

github-actions · 2025-12-31T11:04:05Z

GNU testsuite comparison:

GNU test failed: tests/shuf/shuf-reservoir. tests/shuf/shuf-reservoir is passing on 'main'. Maybe you have to rebase?
GNU test failed: tests/sort/sort-stale-thread-mem. tests/sort/sort-stale-thread-mem is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/tail/overlay-headers (fails in this run but passes in the 'main' branch)

Make safe-traversal feature conditional for chmod and du crates, enabling compilation on Redox OS which lacks support for the fstatat syscalls required by uucore's safe_traversal module. Changes: - Move safe-traversal to platform-specific dependencies for non-Redox Unix - Add guards to exclude DirFd usage on Redox - Provide Redox-specific implementation for chmod's walk_dir_with_context using standard filesystem operations - Add guard to du's new_from_dirfd to match its DirFd import guard Both utilities now fall back to standard fs operations on Redox.

github-actions · 2025-12-31T12:42:18Z

GNU testsuite comparison:

Congrats! The gnu test tests/tty/tty-eof is no longer failing!

github-actions · 2025-12-31T13:01:12Z

GNU testsuite comparison:

Congrats! The gnu test tests/tty/tty-eof is no longer failing!

abendrothj · 2025-12-31T19:42:33Z

That should do it. Let me know if there's anything else needed for this pr to be merged

sylvestre · 2026-01-03T10:53:17Z

@sylvestre That should do it. Let me know if there's anything else needed for this pr to be merged

still a bunch of jobs are failing :)

abendrothj · 2026-01-05T13:02:03Z

Oh wow, was passing completely until I updated the branch. Will fix

github-actions · 2026-01-05T13:14:17Z

GNU testsuite comparison:

Congrats! The gnu test tests/basenc/bounded-memory is now passing!
Note: The gnu test tests/dd/no-allocate was skipped on 'main' but is now failing.

abendrothj · 2026-01-05T13:24:57Z

A new test was added in that merge (added in commit abd581f) and was failing since it was expecting the old linux-only safe traversal setup. Should be adjusted to the unixification now @sylvestre :)

github-actions · 2026-01-05T13:26:53Z

GNU testsuite comparison:

Congrats! The gnu test tests/basenc/bounded-memory is now passing!
Note: The gnu test tests/dd/no-allocate was skipped on 'main' but is now failing.

src/uu/rm/src/platform/redox.rs

src/uu/rm/src/rm.rs

src/uu/chmod/src/chmod.rs

…nd improve code clarity

abendrothj · 2026-01-07T12:31:13Z

Should be cleaner now!

; resolve SMACK conflicts

github-actions · 2026-01-09T06:24:20Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tty/tty-eof (passes in this run but fails in the 'main' branch)

sylvestre · 2026-01-09T07:23:00Z

well done

abendrothj · 2026-01-09T08:54:32Z

Thanks! :)

feat: Expand safe directory traversal to all Unix platforms and fix r…

c9d6f81

…elated type conversions.

sylvestre requested changes Dec 23, 2025

View reviewed changes

abendrothj added 2 commits December 27, 2025 07:04

Merge branch 'main' of https://github.com/uutils/coreutils into main

f1c7082

Resolved merge conflict in src/uu/du/src/du.rs by keeping the unix cfg guard (not target_os = "linux") to align with the PR's goal of expanding safe_traversal to all Unix platforms.

abendrothj requested a review from sylvestre December 27, 2025 15:11

abendrothj and others added 3 commits December 28, 2025 01:10

Merge branch 'main' into main

1c06851

Merge branch 'main' into main

cfbf666

abendrothj force-pushed the main branch from 00fe208 to 9445537 Compare December 28, 2025 11:25

abendrothj and others added 2 commits December 28, 2025 03:28

Merge branch 'main' into main

959d39d

fix: That should be all the casts ignored by clippy (were showing as …

d8348c5

…unnecessary)

fix: Suppress unnecessary cast warnings in cp and du modules

4f65a77

abendrothj and others added 3 commits December 28, 2025 04:39

fix: Ensure proper type handling for mode_t in rm and safe_traversal …

3cb2071

…modules & disable safe dir for Redox (assumedly will be handled in another PR but can implement Redox specific version if requested)

Merge branch 'main' into main

29a04c0

fix: Improve code formatting for readability in safe_remove_dir_recur…

e326036

…sive_impl and safe_traversal modules

abendrothj added 4 commits December 28, 2025 05:35

fix: Use type inference for mode checks in prompt_file_with_stat and …

c8cc10c

…safe_remove_dir_recursive_impl

fix(android): handle symlink and directory checks with appropriate ty…

05d675b

…pe for Android platform

fix(redox): improve error handling for unsupported safe traversal ope…

0f48443

…rations

fix(unix): simplify symlink and directory checks for improved readabi…

e6a9637

…lity (final huzzah)

abendrothj added 2 commits December 31, 2025 02:35

rm: add Redox-specific stub implementations for safe traversal

2102a85

rm: add spell-checker directive for fstatat in Redox stub implementat…

370107e

…ions

cargo: fix formatting of uucore dependencies in Cargo.toml

5cc0c65

abendrothj added 2 commits December 31, 2025 12:08

Merge branch 'main' into main

1fc7d18

Merge branch 'main' into main

44950a2

Merge branch 'main' into main

b135427

test(chmod): improve error message handling for permission denied cases

fe8ab05

sylvestre reviewed Jan 6, 2026

View reviewed changes

src/uu/rm/src/platform/redox.rs Outdated Show resolved Hide resolved

sylvestre reviewed Jan 6, 2026

View reviewed changes

src/uu/rm/src/rm.rs Outdated Show resolved Hide resolved

sylvestre reviewed Jan 6, 2026

View reviewed changes

src/uu/chmod/src/chmod.rs Outdated Show resolved Hide resolved

abendrothj added 2 commits January 7, 2026 04:25

refactor(chmod, rm): update platform-specific handling for Redox OS a…

b5eab57

…nd improve code clarity

Merge upstream/main and resolve conflicts in chmod.rs

12566dd

abendrothj requested a review from sylvestre January 7, 2026 12:41

Merge branch 'main'

d8cadbe

; resolve SMACK conflicts

sylvestre merged commit 30239e6 into uutils:main Jan 9, 2026
131 of 132 checks passed

Uh oh!

feat: Expand safe directory traversal to all Unix platforms and fix related type conversions. #9792

feat: Expand safe directory traversal to all Unix platforms and fix related type conversions. #9792

Uh oh!

Conversation

abendrothj commented Dec 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Dec 23, 2025

Uh oh!

sylvestre left a comment

Choose a reason for hiding this comment

Uh oh!

sylvestre commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 28, 2025

Uh oh!

github-actions bot commented Dec 28, 2025

Uh oh!

github-actions bot commented Dec 28, 2025

Uh oh!

github-actions bot commented Dec 28, 2025

Uh oh!

github-actions bot commented Dec 28, 2025

Uh oh!

github-actions bot commented Dec 28, 2025

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

abendrothj commented Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sylvestre commented Jan 3, 2026

Uh oh!

abendrothj commented Jan 5, 2026

Uh oh!

github-actions bot commented Jan 5, 2026

Uh oh!

abendrothj commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 5, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

abendrothj commented Jan 7, 2026

Uh oh!

github-actions bot commented Jan 9, 2026

Uh oh!

Uh oh!

sylvestre commented Jan 9, 2026

Uh oh!

abendrothj commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

abendrothj commented Dec 23, 2025 •

edited

Loading

abendrothj commented Dec 31, 2025 •

edited

Loading

abendrothj commented Jan 5, 2026 •

edited

Loading