External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-09-19 21:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: add a check to avoid wrapping -1 into an owned file

Browse Source 
Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2024-05-27 06:45:56 +00:00 committed by Liu Wei
parent 1845e63e7c
commit a9e41c417a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmm/src/serial_manager.rs
View File

@ -77,6 +77,10 @@ pub enum Error {
/// Cannot remove the serial socket /// Cannot remove the serial socket
#[error("Error removing serial socket: {0}")] #[error("Error removing serial socket: {0}")]
RemoveUnixSocket(#[source] io::Error), RemoveUnixSocket(#[source] io::Error),
/// Cannot duplicate file descriptor
#[error("Error duplicating file descriptor: {0}")]
DupFd(#[source] io::Error),
} }
pub type Result<T> = result::Result<T, Error>; pub type Result<T> = result::Result<T, Error>;
@ -143,7 +147,12 @@ impl SerialManager {
// SAFETY: trivially safe // SAFETY: trivially safe
if unsafe { libc::isatty(libc::STDIN_FILENO) == 1 } { if unsafe { libc::isatty(libc::STDIN_FILENO) == 1 } {
// SAFETY: STDIN_FILENO is a valid fd // SAFETY: STDIN_FILENO is a valid fd
let stdin_clone = unsafe { File::from_raw_fd(libc::dup(libc::STDIN_FILENO)) }; let fd = unsafe { libc::dup(libc::STDIN_FILENO) };
if fd == -1 {
return Err(Error::DupFd(std::io::Error::last_os_error()));
}
// SAFETY: fd is valid and owned by us
let stdin_clone = unsafe { File::from_raw_fd(fd) };
// SAFETY: FFI calls with correct arguments // SAFETY: FFI calls with correct arguments
let ret = unsafe { let ret = unsafe {
let mut flags = libc::fcntl(stdin_clone.as_raw_fd(), libc::F_GETFL); let mut flags = libc::fcntl(stdin_clone.as_raw_fd(), libc::F_GETFL);