Skip to content

expand: remove .is_dir() from path to avoid TOCTOU race #13203

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.

Sign up for GitHub

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

Open
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

expand: remove .is_dir() from path to avoid TOCTOU race #13203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/uu/expand/src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use std::str::from_utf8;
use thiserror::Error;
use unicode_width::UnicodeWidthChar;
use uucore::display::Quotable;
use uucore::error::{FromIo, UError, UResult, USimpleError, set_exit_code};
use uucore::error::{FromIo, UError, UResult, set_exit_code};
use uucore::{format_usage, show, translate};

pub mod options {
Expand Down Expand Up @@ -280,8 +280,10 @@ fn open(path: &OsString) -> UResult<BufReader<Box<dyn Read>>> {
Ok(BufReader::new(Box::new(stdin()) as Box<dyn Read>))
} else {
let path_ref = Path::new(path);
// some platforms cannot catch this as read error. accept TOCTOU race.
#[cfg(any(target_os = "wasi", target_os = "windows"))]
if path_ref.is_dir() {
return Err(USimpleError::new(
return Err(uucore::error::USimpleError::new(
1,
translate!("expand-error-is-directory", "file" => path.maybe_quote()),
));
Expand Down
Loading