Skip to content

fix(macos): avoid double-closing virtiofs descriptors #2

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

Merged
ZhiXiao-Lin merged 1 commit into from
Jul 11, 2026
Merged

fix(macos): avoid double-closing virtiofs descriptors #2

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
8 changes: 4 additions & 4 deletions src/devices/src/virtio/fs/macos/passthrough.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2063,10 +2063,10 @@ impl FileSystem for PassthroughFs {
return Err(linux_error(io::Error::last_os_error()));
}

let ret = unsafe { libc::close(fd) };
if ret == -1 {
return Err(linux_error(io::Error::last_os_error()));
}
// `file` owns `fd` and closes it on drop. Closing the raw descriptor
// here as well races with descriptor reuse and can close an unrelated
// virtio-fs handle, surfacing in the guest as sporadic EBADF on tar's
// close(). This mirrors the Linux fix in 27910fe.

// We've checked that map_sender is something above.
let sender = map_sender.as_ref().unwrap();
Expand Down
Loading