mattsu2020:rm_fix_full_path - Branch - uutils/coreutils

rm:fix safe traversal/access

#9577

Comparing

mattsu2020:rm_fix_full_path

(

fbb0fd9

) with

main

(

5b261bc

)

-2%

Improvements: 1

Regressions: 1

Untouched: 125

Skipped: 6

Benchmarks

Skipped (6)

Failed

tsort_input_parsing_heavy[5000]

src/uu/tsort/benches/tsort_bench.rs

Regression

-2%

83.1 ms85.2 ms

Improved

rm_recursive_tree

src/uu/rm/benches/rm_bench.rs

+9%

13.6 ms12.5 ms

Passed

cksum_crc32b

src/uu/cksum/benches/cksum_bench.rs

13.9 ms13.8 ms

cksum_multiple_files

src/uu/cksum/benches/cksum_bench.rs

26 ms25.9 ms

cksum_default

src/uu/cksum/benches/cksum_bench.rs

17.5 ms17.4 ms

cksum_raw_output

src/uu/cksum/benches/cksum_bench.rs

17.5 ms17.5 ms

cksum_crc

src/uu/cksum/benches/cksum_bench.rs

17.5 ms17.5 ms

cp_large_file[16]

src/uu/cp/benches/cp_bench.rs

359 µs357.7 µs

rm_multiple_files

src/uu/rm/benches/rm_bench.rs

2.3 ms2.3 ms

rm_single_file

src/uu/rm/benches/rm_bench.rs

119.7 ms119.4 ms

sort_reverse_locale[500000]

src/uu/sort/benches/sort_bench.rs

363.2 ms362.7 ms

sort_case_sensitive[500000]

src/uu/sort/benches/sort_bench.rs

175 ms174.8 ms

rm_force_files

src/uu/rm/benches/rm_bench.rs

2 ms2 ms

b64_decode_ignore_garbage_synthetic

src/uu/base64/benches/base64_bench.rs

166.8 µs166.7 µs

cksum_blake2b

src/uu/cksum/benches/cksum_bench.rs

193 ms192.9 ms

du_wide_tree[(5000, 500)]

src/uu/du/benches/du_bench.rs

11.3 ms11.3 ms

ls_recursive_long_all_balanced_tree[(6, 4, 15)]

src/uu/ls/benches/ls_bench.rs

134.6 ms134.5 ms

factor_multiple_u64s[2]

src/uu/factor/benches/factor_bench.rs

213.2 ms213.1 ms

sort_mixed_utf8_locale

src/uu/sort/benches/sort_locale_bench.rs

38.9 ms38.9 ms

ls_recursive_long_all_deep_tree[(100, 4)]

src/uu/ls/benches/ls_bench.rs

3.3 ms3.3 ms

mv_single_file

src/uu/mv/benches/mv_bench.rs

136 ms135.9 ms

mv_force_overwrite

src/uu/mv/benches/mv_bench.rs

138.4 ms138.3 ms

ls_recursive_long_all_mixed_tree

src/uu/ls/benches/ls_bench.rs

2.9 ms2.9 ms

ls_recursive_long_all_wide_tree[(15000, 1500)]

src/uu/ls/benches/ls_bench.rs

143.5 ms143.4 ms

cksum_blake3

src/uu/cksum/benches/cksum_bench.rs

207.8 µs207.8 µs

cp_recursive_deep_tree[(120, 4)]

src/uu/cp/benches/cp_bench.rs

13.6 ms13.6 ms

hashsum_md5

src/uu/hashsum/benches/hashsum_bench.rs

32 ms32 ms

ls_recursive_mixed_tree

src/uu/ls/benches/ls_bench.rs

1.4 ms1.4 ms

shuf_repeat_sampling[50000]

src/uu/shuf/benches/shuf_bench.rs

4.7 ms4.7 ms

ls_recursive_deep_tree[(200, 2)]

src/uu/ls/benches/ls_bench.rs

2.2 ms2.2 ms

tsort_linear_chain[1000000]

src/uu/tsort/benches/tsort_bench.rs

1.5 s1.5 s

tsort_tree_dag[(10, 3)]

src/uu/tsort/benches/tsort_bench.rs

34.2 ms34.2 ms

hashsum_sha512

src/uu/hashsum/benches/hashsum_bench.rs

110.8 ms110.8 ms

cksum_sha2

src/uu/cksum/benches/cksum_bench.rs

1.7 s1.7 s

sort_ascii_utf8_locale

src/uu/sort/benches/sort_locale_bench.rs

43.5 ms43.5 ms

split_number_chunks

src/uu/split/benches/split_bench.rs

288.1 µs288.1 µs

cksum_sha256

src/uu/cksum/benches/cksum_bench.rs

1.7 s1.7 s

cksum_sha3

src/uu/cksum/benches/cksum_bench.rs

1.8 s1.8 s

uniq_heavy_duplicates[10000]

src/uu/uniq/benches/uniq_bench.rs

2 ms2 ms

cut_bytes

src/uu/cut/benches/cut_bench.rs

8.5 ms8.5 ms

tsort_complex_dag[50000]

src/uu/tsort/benches/tsort_bench.rs

84.3 ms84.3 ms

sort_ascii_only[500000]

src/uu/sort/benches/sort_bench.rs

354.8 ms354.8 ms

mv_directory

src/uu/mv/benches/mv_bench.rs

3.5 ms3.5 ms

numfmt_to_si_precision[10000]

src/uu/numfmt/benches/numfmt_bench.rs

35.4 ms35.4 ms

sort_ascii_c_locale

src/uu/sort/benches/sort_locale_bench.rs

21.7 ms21.7 ms

cut_fields_tab

src/uu/cut/benches/cut_bench.rs

34.1 ms34.1 ms

numfmt_from_si[10000]

src/uu/numfmt/benches/numfmt_bench.rs

32.7 ms32.7 ms

numfmt_to_si[10000]

src/uu/numfmt/benches/numfmt_bench.rs

33.7 ms33.7 ms

numfmt_round_modes[("up", 10000)]

src/uu/numfmt/benches/numfmt_bench.rs

34.2 ms34.2 ms

fold_many_lines[100000]

src/uu/fold/benches/fold_bench.rs

80.1 ms80.1 ms

cksum_sysv

src/uu/cksum/benches/cksum_bench.rs

48.3 ms48.3 ms

numfmt_round_modes[("towards-zero", 10000)]

src/uu/numfmt/benches/numfmt_bench.rs

34.2 ms34.2 ms

numfmt_padding[(10000, 50)]

src/uu/numfmt/benches/numfmt_bench.rs

48.2 ms48.2 ms

numfmt_round_modes[("down", 10000)]

src/uu/numfmt/benches/numfmt_bench.rs

34.2 ms34.2 ms

hashsum_md5_check

src/uu/hashsum/benches/hashsum_bench.rs

32 ms32 ms

cksum_bsd

src/uu/cksum/benches/cksum_bench.rs

128.3 ms128.3 ms

hashsum_sha256_check

src/uu/hashsum/benches/hashsum_bench.rs

173.6 ms173.6 ms

nl_many_lines[100000]

src/uu/nl/benches/nl_bench.rs

79.8 ms79.8 ms

hashsum_sha256

src/uu/hashsum/benches/hashsum_bench.rs

173.6 ms173.6 ms

sort_key_field[500000]

src/uu/sort/benches/sort_bench.rs

703.7 ms703.7 ms

cksum_sm3

src/uu/cksum/benches/cksum_bench.rs

1.6 s1.6 s

cksum_sha384

src/uu/cksum/benches/cksum_bench.rs

1.1 s1.1 s

cksum_sha224

src/uu/cksum/benches/cksum_bench.rs

1.7 s1.7 s

wc_bytes_lines_synthetic[2000]

src/uu/wc/benches/wc_bench.rs

120.2 ms120.2 ms

cksum_shake128

src/uu/cksum/benches/cksum_bench.rs

1.5 s1.5 s

cksum_shake256

src/uu/cksum/benches/cksum_bench.rs

1.9 s1.9 s

nl_large_file[10]

src/uu/nl/benches/nl_bench.rs

100.9 ms100.9 ms

wc_words_synthetic[2000]

src/uu/wc/benches/wc_bench.rs

11.4 s11.4 s

unexpand_many_lines[100000]

src/uu/unexpand/benches/unexpand_bench.rs

262 ms262 ms

wc_default_large_line_count[100000]

src/uu/wc/benches/wc_bench.rs

50.4 ms50.4 ms

sort_mixed_data[500000]

src/uu/sort/benches/sort_bench.rs

328.5 ms328.5 ms

hashsum_sha1

src/uu/hashsum/benches/hashsum_bench.rs

72.5 ms72.5 ms

unexpand_large_file[10]

src/uu/unexpand/benches/unexpand_bench.rs

549.3 ms549.3 ms

wc_words_large_line_count[100000]

src/uu/wc/benches/wc_bench.rs

48 ms48 ms

numfmt_to_iec[10000]

src/uu/numfmt/benches/numfmt_bench.rs

33.7 ms33.7 ms

fold_custom_width[50000]

src/uu/fold/benches/fold_bench.rs

32.9 ms32.9 ms

cut_fields_custom_delim

src/uu/cut/benches/cut_bench.rs

40.8 ms40.8 ms

expand_many_lines[100000]

src/uu/expand/benches/expand_bench.rs

149.9 ms149.9 ms

seq_formatted

src/uu/seq/benches/seq_bench.rs

97.2 ms97.2 ms

numfmt_large_numbers_si[10000]

src/uu/numfmt/benches/numfmt_bench.rs

32.4 ms32.4 ms

wc_lines_large_line_count[500000]

src/uu/wc/benches/wc_bench.rs

2.9 ms2.9 ms

expand_custom_tabstops[50000]

src/uu/expand/benches/expand_bench.rs

37 ms37 ms

seq_custom_separator

src/uu/seq/benches/seq_bench.rs

28.7 ms28.7 ms

sort_accented_data[500000]

src/uu/sort/benches/sort_bench.rs

363.6 ms363.6 ms

seq_integers

src/uu/seq/benches/seq_bench.rs

26.1 ms26.1 ms

wc_chars_large_line_count[100000]

src/uu/wc/benches/wc_bench.rs

1 ms1 ms

b64_decode_synthetic

src/uu/base64/benches/base64_bench.rs

168.8 µs168.8 µs

ls_recursive_wide_tree[(10000, 1000)]

src/uu/ls/benches/ls_bench.rs

52.6 ms52.6 ms

wc_bytes_synthetic[500]

src/uu/wc/benches/wc_bench.rs

182.4 µs182.4 µs

sort_dictionary_order[500000]

src/uu/sort/benches/sort_bench.rs

1.1 s1.1 s

seq_with_step

src/uu/seq/benches/seq_bench.rs

13.3 ms13.3 ms

cut_characters

src/uu/cut/benches/cut_bench.rs

7.5 ms7.5 ms

wc_lines_variable_length[(50, 500)]

src/uu/wc/benches/wc_bench.rs

3.4 ms3.4 ms

sort_german_c_locale

src/uu/sort/benches/sort_locale_bench.rs

38.5 ms38.5 ms

uniq_with_count[10000]

src/uu/uniq/benches/uniq_bench.rs

1.9 ms1.9 ms

split_lines

src/uu/split/benches/split_bench.rs

5.7 ms5.7 ms

sort_numeric

src/uu/sort/benches/sort_locale_bench.rs

23.2 ms23.2 ms

uniq_case_insensitive[10000]

src/uu/uniq/benches/uniq_bench.rs

1.8 ms1.8 ms

cksum_sha512

src/uu/cksum/benches/cksum_bench.rs

1.1 s1.1 s

wc_lines_extreme_line_lengths[(100000, 200)]

src/uu/wc/benches/wc_bench.rs

1.6 ms1.6 ms

sort_german_locale

src/uu/sort/benches/sort_locale_bench.rs

39.3 ms39.3 ms

seq_large_integers

src/uu/seq/benches/seq_bench.rs

2.2 ms2.2 ms

shuf_lines[100000]

src/uu/shuf/benches/shuf_bench.rs

26.9 ms26.9 ms

split_bytes

src/uu/split/benches/split_bench.rs

510.5 µs510.5 µs

tsort_wide_dag[100000]

src/uu/tsort/benches/tsort_bench.rs

134.1 ms134.1 ms

cksum_sha1

src/uu/cksum/benches/cksum_bench.rs

722.9 ms722.9 ms

ls_recursive_balanced_tree[(6, 4, 15)]

src/uu/ls/benches/ls_bench.rs

55.4 ms55.4 ms

du_all_wide_tree[(5000, 500)]

src/uu/du/benches/du_bench.rs

18.2 ms18.2 ms

sort_case_insensitive[500000]

src/uu/sort/benches/sort_bench.rs

279.7 ms279.7 ms

shuf_input_range[1000000]

src/uu/shuf/benches/shuf_bench.rs

229.1 ms229.1 ms

cksum_md5

src/uu/cksum/benches/cksum_bench.rs

317.8 ms317.9 ms

sort_mixed_c_locale

src/uu/sort/benches/sort_locale_bench.rs

38.4 ms38.4 ms

split_numeric_suffix

src/uu/split/benches/split_bench.rs

5.9 ms5.9 ms

sort_reverse_mixed

src/uu/sort/benches/sort_locale_bench.rs

39.2 ms39.3 ms

cp_recursive_balanced_tree[(5, 4, 10)]

src/uu/cp/benches/cp_bench.rs

72.3 ms72.3 ms

b64_encode_synthetic

src/uu/base64/benches/base64_bench.rs

164.3 µs164.4 µs

mv_multiple_to_dir

src/uu/mv/benches/mv_bench.rs

13.1 ms13.1 ms

sort_unique_mixed

src/uu/sort/benches/sort_locale_bench.rs

39.4 ms39.4 ms

sort_long_line[160000]

src/uu/sort/benches/sort_bench.rs

1.7 ms1.7 ms

cp_archive_balanced_tree[(5, 4, 10)]

src/uu/cp/benches/cp_bench.rs

77.7 ms77.8 ms

cp_recursive_wide_tree[(6000, 800)]

src/uu/cp/benches/cp_bench.rs

189.4 ms189.6 ms

cp_preserve_metadata[(5, 4, 10)]

src/uu/cp/benches/cp_bench.rs

75 ms75.1 ms

sort_numeric[500000]

src/uu/sort/benches/sort_bench.rs

1.2 s1.2 s

sort_unique_locale[500000]

src/uu/sort/benches/sort_bench.rs

495 ms496 ms

du_summarize_balanced_tree[(5, 4, 10)]

src/uu/du/benches/du_bench.rs

8.4 ms8.5 ms

du_deep_tree[(100, 3)]

src/uu/du/benches/du_bench.rs

1.2 ms1.2 ms

du_max_depth_balanced_tree[(6, 4, 10)]

src/uu/du/benches/du_bench.rs

32.8 ms33 ms

Commits

Click on a commit to change the comparison range

Base

main

5b261bc

+14.61%

style(rm): wrap long line in prompt_file_with_stat macro for readability Reformatted the prompt_yes! macro call across multiple lines to improve code readability and adhere to line length conventions. No functional changes.

38d339d

3 hours ago

by mattsu2020

-14.61%

refactor(linux/rm): refactor safe_remove_dir_recursive for better FD management and error handling Restructure directory opening and traversal logic to collect entries upfront and drop DirFd early, preventing deep descriptor stacks. Improve permission denied error handling to match GNU rm behavior while maintaining secure operations. This enhances resource efficiency and compatibility without altering functional behavior.

bf28c9a

1 hour ago

by mattsu2020

+2.8%

feat(rm): add progress bar support to recursive dir removal on Linux Refactor `safe_remove_dir_recursive_impl` to accept an optional `ProgressBar` parameter instead of `dir_fd`, opening the directory internally. Add progress increments for each removed item to improve user feedback during long recursive operations.

6a9f123

1 hour ago

by mattsu2020

refactor(rm): simplify control flow in safe_remove_dir_recursive_impl Replaced nested if-else logic with direct else-if in the file removal path to reduce code nesting and improve readability for handling interactive prompts during recursive directory removal.

2957789

1 hour ago

by mattsu2020

refactor: remove handle_permission_denied function from rm linux platform Remove the obsolete `handle_permission_denied` helper function in `src/uu/rm/src/platform/linux.rs`. This function was handling permission denied errors when attempting to remove subdirectories during recursive removal. Its removal simplifies the code and aligns with updated error handling logic, potentially avoiding redundant or buggy behavior in edge cases. The change maintains compatibility for standard rm operations while reducing complexity.

1f78fc6

1 hour ago

by mattsu2020

-2.8%

perf(linux/rm): optimize descriptor usage by keeping dir_fd open in safe_remove_dir_recursive_impl Reuse the existing directory file descriptor instead of opening/closing new ones for each subdirectory or file during recursive removal. This simplifies the code, reduces overhead from descriptor management, and prevents potential deep descriptor stacks on systems with many nested directories. Removed unnecessary `drop(dir_fd)` call and adjusted progress bar increments accordingly.

188d9cf

38 minutes ago

by mattsu2020

-2.41%

style(rm): reformat error assignment in safe_remove_dir_recursive_impl Break the long error assignment line for better readability, ensuring consistent code formatting in the rm utility's Linux platform implementation.

fbb0fd9

36 minutes ago

by mattsu2020

Home Terms Privacy Docs