Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 11 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/hyperlight_host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ lazy_static = "1.4.0"

[target.'cfg(unix)'.dependencies]
seccompiler = { version = "0.5.0", optional = true }
kvm-bindings = { version = "0.13", features = ["fam-wrappers"], optional = true }
kvm-ioctls = { version = "0.23", optional = true }
kvm-bindings = { version = "0.14", features = ["fam-wrappers"], optional = true }
kvm-ioctls = { version = "0.24", optional = true }
mshv-bindings2 = { package="mshv-bindings", version = "=0.2.1", optional = true }
mshv-ioctls2 = { package="mshv-ioctls", version = "=0.2.1", optional = true}
mshv-bindings3 = { package="mshv-bindings", version = "=0.3.2", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/hyperlight_host/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ pub enum HyperlightError {
/// vmm sys Error Occurred
#[error("vmm sys Error {0:?}")]
#[cfg(target_os = "linux")]
VmmSysError(#[from] vmm_sys_util::errno::Error),
VmmSysError(vmm_sys_util::errno::Error),

/// Windows Error
#[cfg(target_os = "windows")]
Expand Down
6 changes: 4 additions & 2 deletions src/hyperlight_host/src/signal_handlers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ pub(crate) fn setup_signal_handlers(config: &SandboxConfiguration) -> crate::Res
vmm_sys_util::signal::register_signal_handler(
libc::SIGSYS,
sigsys_signal_handler::handle_sigsys,
)?;
)
.map_err(crate::HyperlightError::VmmSysError)?;

let original_hook = std::panic::take_hook();
// Set a custom panic hook that checks for "DisallowedSyscall"
Expand All @@ -52,7 +53,8 @@ pub(crate) fn setup_signal_handlers(config: &SandboxConfiguration) -> crate::Res
vmm_sys_util::signal::register_signal_handler(
libc::SIGRTMIN() + config.get_interrupt_vcpu_sigrtmin_offset() as c_int,
vm_kill_signal,
)?;
)
.map_err(crate::HyperlightError::VmmSysError)?;

// Note: For libraries registering signal handlers, it's important to keep in mind that
// the user of the library could have their own signal handlers that we don't want to
Expand Down
Loading