Start from scratch

memN0ps · Feb 13, 2024 · 19d9802 · 19d9802
1 parent 08a5759
commit 19d9802
Show file tree

Hide file tree

Showing 44 changed files with 118 additions and 4,761 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,9 +2,8 @@
 resolver = "2"
 
 members = [
-    "boot",
+    "driver",
     "hypervisor",
-    "xtask",
 ]
 
 [profile.release]

diff --git a/boot/.cargo/config.toml b/boot/.cargo/config.toml
diff --git a/boot/src/main.rs b/boot/src/main.rs
diff --git a/driver/.cargo/config.toml b/driver/.cargo/config.toml
@@ -0,0 +1,3 @@
+[build]
+target = "x86_64-unknown-uefi"
+rustflags = ["-Z", "pre-link-args=/subsystem:efi_runtime_driver"]
diff --git a/boot/Cargo.toml → driver/Cargo.toml b/boot/Cargo.toml → driver/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 uefi = {version = "0.26.0", features = ["global_allocator", "alloc"] } # https://crates.io/crates/uefi
+uefi-services = { version = "0.23.0", default-features = false, features = ["panic_handler"] }
 log = { version = "0.4.20", default-features = false } # https://crates.io/crates/log
 com_logger = "0.1.1" # https://crates.io/crates/com_logger
 

diff --git a/driver/src/main.rs b/driver/src/main.rs
@@ -0,0 +1,18 @@
+#![no_main]
+#![no_std]
+
+use log::*;
+use uefi::prelude::*;
+
+#[entry]
+fn main(_image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
+    com_logger::builder().filter(LevelFilter::Debug).setup();
+
+    uefi_services::init(&mut system_table).unwrap();
+
+    info!("Hello, world!");
+
+    system_table.boot_services().stall(10_000_000);
+
+    Status::SUCCESS
+}
diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml
@@ -5,18 +5,23 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = []
+#secondary-ept = [] # If this feature is enabled, two nested page tables will be created.
+#shellcode-hook = [] # Enables unstable inline hooks (currently not recommended)
+
 [dependencies]
-uefi = {version = "0.26.0", features = ["global_allocator", "alloc"] } # https://crates.io/crates/uefi
 x86 = "0.52.0" # https://crates.io/crates/x86
 x86_64 = "0.14.11" # https://crates.io/crates/x86_64
 thiserror-no-std = "2.0.2" # https://crates.io/crates/thiserror-no-std
 bitfield = "0.14.0" # https://crates.io/crates/bitfield
 bit_field = "0.10.2" # https://crates.io/crates/bit_field
-bitflags = "2.3.3" # https://crates.io/crates/bitflags
+bitflags = "2.4.1" # https://crates.io/crates/bitflags
 elain = "0.3.0" # https://crates.io/crates/elain
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] } # https://crates.io/crates/lazy_static
 obfstr = "0.4.3" # https://crates.io/crates/obfstr/
 static_assertions = "1.1.0" # https://crates.io/crates/static_assertions
 log = "0.4.20" # https://crates.io/crates/log
-kernel-log = "0.1.2" # https://crates.io/crates/kernel-log
-com_logger = "0.1.1" # https://crates.io/crates/com_logger
+com_logger = "0.1.1" # https://crates.io/crates/com_logger
+iced-x86 = { version = "1.20.0", default-features = false, features = ["no_std", "decoder", "block_encoder", "instr_info", "no_d3now", "no_evex", "no_vex", "no_xop"] } # https://crates.io/crates/iced-x86
+bstr = { version = "1.9.0", default-features = false}
diff --git a/hypervisor/src/error.rs b/hypervisor/src/error.rs
@@ -1,3 +1,4 @@
+use alloc::ffi::NulError;
 use thiserror_no_std::Error;
 
 #[derive(Error, Debug)]
@@ -70,4 +71,88 @@ pub enum HypervisorError {
 
     #[error("Failed to resolve memory type for given physical address range")]
     MemoryTypeResolutionError,
+
+    #[error("Invalid CR3 base address")]
+    InvalidCr3BaseAddress,
+
+    #[error("Failed to parse bytes of original function")]
+    InvalidBytes,
+
+    #[error("Couldn't find enough space for the jump shellcode")]
+    NotEnoughBytes,
+
+    #[error("Failed to find original instructions")]
+    NoInstructions,
+
+    #[error("Failed to encode trampoline")]
+    EncodingFailed,
+
+    #[error("Found rip-relative instruction which is not supported")]
+    RelativeInstruction,
+
+    #[error("Found unsupported instruction")]
+    UnsupportedInstruction,
+
+    #[error("VMX is not initialized")]
+    VmxNotInitialized,
+
+    #[error("Hook error")]
+    HookError,
+
+    #[error("Primary EPT not provided")]
+    PrimaryEPTNotProvided,
+
+    #[error("Secondary EPT not provided")]
+    SecondaryEPTNotProvided,
+
+    #[error("Invalid PML4 entry")]
+    InvalidPml4Entry,
+
+    #[error("Invalid PML3 entry")]
+    InvalidPdptEntry,
+
+    #[error("Invalid PML2 entry")]
+    InvalidPdEntry,
+
+    #[error("Invalid PML1 entry")]
+    InvalidPml1Entry,
+
+    #[error("Invalid Permission Character")]
+    InvalidPermissionCharacter,
+
+    #[error("Unaligned address error")]
+    UnalignedAddressError,
+
+    #[error("Already split error")]
+    AlreadySplitError,
+
+    #[error("Out of memory")]
+    OutOfMemory,
+
+    #[error("Page already split")]
+    PageAlreadySplit,
+
+    #[error("Hook manager not provided")]
+    HookManagerNotProvided,
+
+    #[error("NtQuerySystemInformation failed")]
+    NtQuerySystemInformationFailed,
+
+    #[error("ExAllocatePoolFailed failed")]
+    ExAllocatePoolFailed,
+
+    #[error("Pattern not found")]
+    PatternNotFound,
+
+    #[error("SSDT not found")]
+    SsdtNotFound,
+
+    #[error("Failed create a C String")]
+    FailedToCreateCString(#[from] NulError),
+
+    #[error("Failed to get kernel base")]
+    GetKernelBaseFailed,
+
+    #[error("Failed to parse hexadecimal string")]
+    HexParseError,
 }
diff --git a/hypervisor/src/intel/controls.rs b/hypervisor/src/intel/controls.rs