mirror of
https://dev.lirent.ru/Vatrog/vm-introspection-engine.git
synced 2026-07-09 01:46:38 +03:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
8ca84a5861
|
|||
|
91e5e05de4
|
|||
|
32440c7104
|
|||
|
d26f6c0bf0
|
|||
|
0c3aa5ef25
|
|||
|
3028a4eb11
|
|||
|
02e63f2ff0
|
|||
|
5ea9a3785f
|
|||
|
f401738702
|
@@ -22,7 +22,7 @@ jobs:
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends \
|
||||
cmake make zip jq curl ca-certificates \
|
||||
gcc gcc-mingw-w64-x86-64
|
||||
gcc libc6-dev gcc-mingw-w64-x86-64
|
||||
|
||||
- name: Configure
|
||||
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
|
||||
@@ -70,3 +70,58 @@ jobs:
|
||||
curl -fsSL -X POST -H "$auth" \
|
||||
-F "attachment=@dist/${asset};type=application/zip" \
|
||||
"${api}/releases/${rid}/assets?name=${asset}"
|
||||
|
||||
deb:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: node:20-bookworm-slim
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install toolchain
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends \
|
||||
cmake make gcc libc6-dev dpkg-dev file \
|
||||
gcc-mingw-w64-x86-64 ca-certificates curl
|
||||
|
||||
- name: Configure
|
||||
env:
|
||||
TAG: ${{ github.ref_name }}
|
||||
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVMIE_VERSION=${TAG#v}
|
||||
|
||||
- name: Build shared library
|
||||
run: cmake --build build -j --target vmie_shared
|
||||
|
||||
- name: Package
|
||||
run: |
|
||||
set -euo pipefail
|
||||
(cd build && cpack -G DEB)
|
||||
ls -l build/*.deb
|
||||
|
||||
- name: Publish to Debian registry
|
||||
env:
|
||||
TOKEN: ${{ secrets.PUBLISH_TOKEN }} # requires scope: package:write
|
||||
SERVER: ${{ github.server_url }}
|
||||
OWNER: ${{ github.repository_owner }}
|
||||
DISTRIBUTION: stable
|
||||
COMPONENT: main
|
||||
run: |
|
||||
set -euo pipefail
|
||||
url="${SERVER}/api/packages/${OWNER}/debian/pool/${DISTRIBUTION}/${COMPONENT}/upload"
|
||||
auth="Authorization: token ${TOKEN}"
|
||||
for deb in build/*.deb; do
|
||||
# 201 Created = uploaded; 409 Conflict = this version already present (re-run).
|
||||
# Both are success; anything else fails. Do not use curl -f (it would fail 409).
|
||||
code=$(curl -s -o /dev/null -w '%{http_code}' \
|
||||
-X PUT -H "$auth" -T "$deb" "$url")
|
||||
echo "$deb -> HTTP $code"
|
||||
if [ "$code" != 201 ] && [ "$code" != 409 ]; then
|
||||
echo "upload failed: $deb (HTTP $code)" >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
+69
-7
@@ -1,15 +1,19 @@
|
||||
cmake_minimum_required(VERSION 3.18) # find_program(... REQUIRED)
|
||||
project(vmi-engine C)
|
||||
|
||||
set(VMIE_VERSION "0.1.6" CACHE STRING "Library version (MAJOR.MINOR.PATCH); CI passes the tag")
|
||||
project(vmi-engine VERSION ${VMIE_VERSION} LANGUAGES C)
|
||||
|
||||
set(CMAKE_C_STANDARD 17) # generation B uses no C23 feature
|
||||
set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_C_EXTENSIONS ON) # deliberate: strnlen (POSIX) + void* arithmetic (GNU)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON) # -fPIC on all objects: static lib stays linkable into a shared object
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
option(VMIE_LTO "Enable LTO" OFF) # build-only; shipped default is -O2, no LTO
|
||||
|
||||
# ---- host: VMI core as a static library ---------------------------------
|
||||
add_library(vmie STATIC
|
||||
# ---- host: VMI core objects (single owner of the source list) -----------
|
||||
add_library(vmie_obj OBJECT
|
||||
src/core/gpa.c
|
||||
src/engine/gva.c
|
||||
src/engine/sigphys.c
|
||||
@@ -27,15 +31,32 @@ add_library(vmie STATIC
|
||||
src/handlers/x86dec.c
|
||||
src/handlers/pmap.c
|
||||
src/handlers/snapdiff.c)
|
||||
target_include_directories(vmie
|
||||
target_include_directories(vmie_obj
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include # public API: include/*.h
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/core/include # private: core.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/engine/include # private: engine-arch.h, pe.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/engine/win32) # private: engine-win32.h, contract.h
|
||||
target_compile_options(vmie PRIVATE -O2 -Wall -Wextra)
|
||||
target_compile_options(vmie_obj PRIVATE -O2 -Wall -Wextra)
|
||||
if(VMIE_LTO)
|
||||
target_compile_options(vmie PRIVATE -flto)
|
||||
target_link_options(vmie PRIVATE -flto)
|
||||
target_compile_options(vmie_obj PRIVATE -flto)
|
||||
target_link_options(vmie_obj PRIVATE -flto)
|
||||
endif()
|
||||
|
||||
# ---- host: static library (in-tree consumers: CLIs + test) --------------
|
||||
# $<TARGET_OBJECTS:> carries object files only, not usage requirements:
|
||||
# re-declare the PUBLIC include scope so vmie_cli/vmie_scan still see include/.
|
||||
add_library(vmie STATIC $<TARGET_OBJECTS:vmie_obj>)
|
||||
target_include_directories(vmie PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
|
||||
# ---- host: shared library (external delivery: libvmie.so.*) -------------
|
||||
add_library(vmie_shared SHARED $<TARGET_OBJECTS:vmie_obj>)
|
||||
target_include_directories(vmie_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
set_target_properties(vmie_shared PROPERTIES
|
||||
OUTPUT_NAME vmie
|
||||
SOVERSION ${PROJECT_VERSION_MAJOR}
|
||||
VERSION ${PROJECT_VERSION})
|
||||
if(VMIE_LTO)
|
||||
target_link_options(vmie_shared PRIVATE -flto)
|
||||
endif()
|
||||
|
||||
# ---- host: CLI demonstrator over the library ----------------------------
|
||||
@@ -61,3 +82,44 @@ add_custom_command(
|
||||
COMMENT "Cross-compiling vmie-startup.exe (mingw-w64, x86-64)"
|
||||
VERBATIM)
|
||||
add_custom_target(vmie-startup ALL DEPENDS ${VMIE_STARTUP})
|
||||
|
||||
# ---- install: shared library + public headers ---------------------------
|
||||
# Versioned file + SONAME symlink -> runtime; unversioned linker symlink -> dev.
|
||||
install(TARGETS vmie_shared
|
||||
LIBRARY
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
COMPONENT runtime
|
||||
NAMELINK_COMPONENT dev)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vmie
|
||||
COMPONENT dev
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
|
||||
# ---- package: two Debian packages (runtime + dev) -----------------------
|
||||
set(CPACK_GENERATOR "DEB")
|
||||
set(CPACK_DEB_COMPONENT_INSTALL ON)
|
||||
set(CPACK_COMPONENTS_ALL runtime dev)
|
||||
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
|
||||
|
||||
# component -> Debian package name (Debian shared-library convention)
|
||||
set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "libvmie${PROJECT_VERSION_MAJOR}")
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_NAME "libvmie-dev")
|
||||
|
||||
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
|
||||
set(VMIE_DEB_MAINTAINER "Gregory Lirent <opensource@lirent.ru>"
|
||||
CACHE STRING "Debian package Maintainer field")
|
||||
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${VMIE_DEB_MAINTAINER}")
|
||||
set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
|
||||
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
|
||||
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
|
||||
|
||||
set(CPACK_COMPONENT_RUNTIME_DESCRIPTION
|
||||
"VM introspection engine (Windows-guest memory introspection) - shared library")
|
||||
set(CPACK_COMPONENT_DEV_DESCRIPTION
|
||||
"VM introspection engine (Windows-guest memory introspection) - development files")
|
||||
|
||||
# dev depends on the exact runtime version; runtime libc dependency via shlibdeps
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libvmie${PROJECT_VERSION_MAJOR} (= ${PROJECT_VERSION})")
|
||||
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
|
||||
|
||||
include(CPack)
|
||||
|
||||
+46
-2
@@ -62,7 +62,47 @@ vmie_mem* vmie_mem_open(const char* path, uint64_t low);
|
||||
* Returns a heap-owned handle, or NULL on failure. Release with vmie_mem_close(). */
|
||||
vmie_mem* vmie_mem_open_segs(const char* path, const gpa_seg* segs, int nseg);
|
||||
|
||||
/* Unmap, close, and free a handle from vmie_mem_open*. Safe on NULL. */
|
||||
/* Build a source from an already-open file descriptor `fd` instead of a path,
|
||||
* with the single-`low` map (as vmie_mem_open). `fd` is BORROWED: it is dup()'d
|
||||
* internally, so the source owns its own copy and the caller's `fd` stays open
|
||||
* and valid both after this call AND after vmie_mem_close(). `fd` must reference
|
||||
* an mmap-able, read-write object (a regular file, memfd_create, or POSIX shm) -
|
||||
* a pipe/socket/tty is not mmap-able and yields NULL. The fd's file position is
|
||||
* not read or changed (the mapping starts at offset 0). Returns a heap-owned
|
||||
* handle, or NULL on dup/fstat/mmap failure. Release with vmie_mem_close(). */
|
||||
vmie_mem* vmie_mem_from_fd(int fd, uint64_t low);
|
||||
|
||||
/* As vmie_mem_from_fd, but with an explicit segment map (`nseg` entries; see
|
||||
* gpa_seg), well-formed against the file size. Same dup-borrow semantics: the
|
||||
* caller's `fd` stays valid after this call and after vmie_mem_close(); `fd`
|
||||
* must be an mmap-able RW object and its position is untouched. Returns a
|
||||
* heap-owned handle, or NULL on failure. Release with vmie_mem_close(). */
|
||||
vmie_mem* vmie_mem_from_fd_segs(int fd, const gpa_seg* segs, int nseg);
|
||||
|
||||
/* Read-only twin of vmie_mem_from_fd: build a source from `fd` with the
|
||||
* single-`low` map, but map it PROT_READ and mark it read-only. On the returned
|
||||
* handle gpa_write/gva_write (and any write through the engine) return -1; all
|
||||
* reads - gpa_read/gva_read, gpa_ptr/gva_ptr, gva_regions, sig_scan_mem - behave
|
||||
* exactly as on an RW source. Because only read access is needed, `fd` may be
|
||||
* opened O_RDONLY (an O_RDWR fd is also accepted). Same dup-borrow semantics: the
|
||||
* fd is dup()'d internally, so the caller's `fd` stays valid after this call AND
|
||||
* after vmie_mem_close(); its file position is not read or changed. NOTE: writing
|
||||
* THROUGH a pointer returned by gpa_ptr/gva_ptr on a read-only source is a
|
||||
* contract violation (the pages are read-only and the store will fault) - use
|
||||
* such pointers for reading only. Returns a heap-owned handle, or NULL on
|
||||
* dup/fstat/mmap failure. Release with vmie_mem_close(). */
|
||||
vmie_mem* vmie_mem_from_ro_fd(int fd, uint64_t low);
|
||||
|
||||
/* As vmie_mem_from_ro_fd, but with an explicit segment map (`nseg` entries; see
|
||||
* gpa_seg), well-formed against the file size. Same read-only contract
|
||||
* (writes -> -1; no writes through gpa_ptr/gva_ptr) and dup-borrow semantics
|
||||
* (caller's `fd` stays valid after this call and after vmie_mem_close(); accepts
|
||||
* an O_RDONLY or O_RDWR fd; position untouched). Returns a heap-owned handle, or
|
||||
* NULL on failure. Release with vmie_mem_close(). */
|
||||
vmie_mem* vmie_mem_from_ro_fd_segs(int fd, const gpa_seg* segs, int nseg);
|
||||
|
||||
/* Unmap, close, and free a handle from vmie_mem_open*, vmie_mem_from_fd*, or
|
||||
* vmie_mem_from_ro_fd*. Safe on NULL. */
|
||||
void vmie_mem_close(vmie_mem* m);
|
||||
|
||||
/* ---- flat memory view (single owner) ------------------------------------- *
|
||||
@@ -85,7 +125,11 @@ typedef struct {
|
||||
* x86-64 has no read bit: a present page is readable, so VR_R is always set on a
|
||||
* returned region. Write/execute/user are the EFFECTIVE rights along the whole
|
||||
* page-table path (RW & US are AND-ed across levels, NX is OR-ed), not just the
|
||||
* leaf entry, so they reflect what the guest CPU actually enforces. */
|
||||
* leaf entry, so they reflect what the guest CPU actually enforces. One
|
||||
* exception keeps VR_X honest under KVA shadow (KPTI): the kernel CR3 marks
|
||||
* user-half PML4Es NX as hardening, but ring 3 executes those pages via the
|
||||
* user/shadow CR3 (same shared lower tables, NX-clear PML4E), so the user-half
|
||||
* top-level NX bit is ignored when deriving VR_X. */
|
||||
#ifndef VMIE_VREGION_DEFINED
|
||||
#define VMIE_VREGION_DEFINED
|
||||
#define VR_R 0x1u /* readable (present => always set) */
|
||||
|
||||
+12
-9
@@ -70,18 +70,21 @@ int gva_sig_scan_multi(vmie_mem* m, uintptr_t cr3, uint64_t lo, uint64_t hi,
|
||||
uint32_t prot_any, const sigset* s,
|
||||
sig_multi_hit* out, int max);
|
||||
|
||||
/* code-xref: every instruction in the X-regions of [lo,hi] whose near rel
|
||||
* branch or RIP-relative memory operand resolves to `target_va`. Brute-scans
|
||||
* each byte offset with the light x86-64 decoder (x86dec.h, NOT a full
|
||||
* disassembler): an E8/E9/EB/Jcc rel branch matches when next_rip + rel ==
|
||||
/* code-xref: every instruction in the regions of [lo,hi] kept by `prot_any`
|
||||
* whose near rel branch or RIP-relative memory operand resolves to `target_va`.
|
||||
* Brute-scans each byte offset with the light x86-64 decoder (x86dec.h, NOT a
|
||||
* full disassembler): an E8/E9/EB/Jcc rel branch matches when next_rip + rel ==
|
||||
* target_va, and any RIP-relative operand (ModRM mod=00, rm=101) matches when
|
||||
* next_rip + disp32 == target_va (this covers lea/mov and any other rip-rel
|
||||
* form). Records each matching instruction-start VA. The sweep forces VR_X and
|
||||
* carries a >=15-byte overlap (max x86 instruction length) so no instruction is
|
||||
* cut at a window seam. Writes up to `max` VAs to `out` (NULL to count only) and
|
||||
* returns the TOTAL number of matches, or -1 on bad input. */
|
||||
* form). Records each matching instruction-start VA. The sweep is scoped by
|
||||
* `prot_any` (pass VR_X to restrict to code; pass VR_R when the target's
|
||||
* page-table X bit is unavailable - the decoder and exact target match keep the
|
||||
* result correct, only more bytes are decoded) and carries a >=15-byte overlap
|
||||
* (max x86 instruction length) so no instruction is cut at a window seam. Writes
|
||||
* up to `max` VAs to `out` (NULL to count only) and returns the TOTAL number of
|
||||
* matches, or -1 on bad input. */
|
||||
int gva_code_xref(vmie_mem* m, uintptr_t cr3, uint64_t lo, uint64_t hi,
|
||||
uint64_t target_va, uint64_t* out, int max);
|
||||
uint32_t prot_any, uint64_t target_va, uint64_t* out, int max);
|
||||
|
||||
/* immediate / constant xref: every instruction in [lo,hi] (kept by the
|
||||
* protection filter `prot_any`; pass VR_X to restrict to code) whose IMMEDIATE
|
||||
|
||||
@@ -83,6 +83,29 @@ typedef struct {
|
||||
* failure. Free with vmie_win32_close(). */
|
||||
vmie_win32* vmie_win32_open(const char* ram_path, uint64_t low);
|
||||
|
||||
/* As vmie_win32_open, but over an already-open file descriptor `fd` for the RAM
|
||||
* backing file instead of a path. `fd` is BORROWED: it is dup()'d internally, so
|
||||
* the context owns its own copy and the caller's `fd` stays open and valid after
|
||||
* this call AND after vmie_win32_close(). `fd` must reference an mmap-able,
|
||||
* read-write object (regular file / memfd_create / POSIX shm); its file position
|
||||
* is not read or changed. Returns a new context (call host_bootstrap() next), or
|
||||
* NULL on dup/fstat/mmap failure. Free with vmie_win32_close(). */
|
||||
vmie_win32* vmie_win32_open_fd(int fd, uint64_t low);
|
||||
|
||||
/* Open a READ-ONLY context over the RAM backing file `fd`, for a consumer that
|
||||
* only reads. It takes a caller-supplied `kcr3` (kernel cr3 / System DirectoryTableBase)
|
||||
* and builds the struct-offset profile read-only from the image (no bootstrap
|
||||
* handshake - beacon and ACK are not used). The result has the FULL read
|
||||
* capability: proc_list/proc_modules AND the section / function / import / export
|
||||
* / callgraph / hook surfaces, gva_read_text, and the generic gva_* and scanner
|
||||
* surfaces via vmie_win32_mem(). Any write (gva_write) returns -1 because the
|
||||
* mapping is PROT_READ. `fd` is BORROWED (dup()'d internally; the caller's fd
|
||||
* stays valid after this call AND after vmie_win32_close()); an O_RDONLY fd is
|
||||
* accepted. `low` is the below-4G split, as in vmie_win32_open_fd. Returns a new
|
||||
* context, or NULL if `kcr3` does not resolve a kernel (ntoskrnl not found under
|
||||
* it) or on dup/fstat/mmap failure. Free with vmie_win32_close(). */
|
||||
vmie_win32* vmie_win32_open_ro_fd(int fd, uint64_t low, uint64_t kcr3);
|
||||
|
||||
/* Unmap, close, and free a context. Safe on NULL. After this, every pointer
|
||||
* into guest memory obtained through this context is invalid. */
|
||||
void vmie_win32_close(vmie_win32* v);
|
||||
|
||||
+154
-18
@@ -52,6 +52,9 @@ int gpa_read(vmie_mem* m, uintptr_t offs, void* buf, const size_t nmemb) {
|
||||
}
|
||||
|
||||
int gpa_write(vmie_mem* m, uintptr_t offs, const void* src, const size_t nmemb) {
|
||||
if (m->ro) {
|
||||
return -1;
|
||||
}
|
||||
if (out_of_bounds(m, &offs, nmemb)) {
|
||||
return -1;
|
||||
}
|
||||
@@ -88,37 +91,64 @@ static int segs_valid(const gpa_seg* segs, int nseg, uint64_t fsize) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Finish a vmie_mem over an ALREADY-OWNED fd (from open() or dup()): fstat it,
|
||||
* validate the seg map against its real size, mmap it shared (PROT_READ when
|
||||
* `ro`, else PROT_RW), and fill `m`. On ANY failure close `fd` and clean `m`
|
||||
* (no partial state); on success store the fd in `m->fd`, record `ro`, and
|
||||
* return 0. The fd's lifetime is now owned by `m` (closed in gpa_close). The
|
||||
* single mmap/validate site shared by every constructor. */
|
||||
__attribute__((cold))
|
||||
int gpa_open_segs(vmie_mem* m, const char* path, const gpa_seg* segs, int nseg) {
|
||||
static int gpa_map_owned_fd(vmie_mem* m, int fd, const gpa_seg* segs, int nseg, int ro) {
|
||||
struct stat st;
|
||||
|
||||
if ((m->fd = open(path, O_RDWR)) < 0) {
|
||||
goto ret_;
|
||||
}
|
||||
|
||||
if (fstat(m->fd, &st) || !segs_valid(segs, nseg, (uint64_t)st.st_size)) {
|
||||
if (fstat(fd, &st) || !segs_valid(segs, nseg, (uint64_t)st.st_size)) {
|
||||
goto close_;
|
||||
}
|
||||
|
||||
if ((m->pa = mmap(NULL, st.st_size, PROT_RW, MAP_SHARED, m->fd, 0)) == MAP_FAILED) {
|
||||
const int prot = ro ? PROT_READ : PROT_RW;
|
||||
if ((m->pa = mmap(NULL, st.st_size, prot, MAP_SHARED, fd, 0)) == MAP_FAILED) {
|
||||
close_:
|
||||
close(m->fd);
|
||||
ret_:
|
||||
close(fd);
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
|
||||
m->fd = fd;
|
||||
m->fsize = st.st_size;
|
||||
m->nseg = nseg;
|
||||
m->ro = ro;
|
||||
memcpy(m->seg, segs, (size_t)nseg * sizeof *segs);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Convenience: the classic single-`low` QEMU map. Below the 4 GiB PCI hole the
|
||||
* file maps 1:1 ([0,low)->file[0,low)); at and above 4 GiB it resumes at file
|
||||
* offset low. When low >= fsize the hole is never reached, so one inert identity
|
||||
* seg covering the whole image suffices. */
|
||||
/* Build the classic single-`low` QEMU map into out[0..nseg) and return nseg.
|
||||
* Below the 4 GiB PCI hole the file maps 1:1 ([0,low)->file[0,low)); at and
|
||||
* above 4 GiB it resumes at file offset low. When low >= fsize the hole is never
|
||||
* reached, so one inert identity seg covering the whole image suffices (nseg=1).
|
||||
* The single low-map site shared by gpa_open (fsize from stat) and gpa_from_fd
|
||||
* (fsize from fstat). */
|
||||
__attribute__((cold))
|
||||
static int low_segs(uint64_t fsize, uint64_t low, gpa_seg out[2]) {
|
||||
if (low >= fsize) {
|
||||
out[0] = (gpa_seg){ 0, fsize, 0 };
|
||||
return 1;
|
||||
}
|
||||
out[0] = (gpa_seg){ 0, low, 0 };
|
||||
out[1] = (gpa_seg){ RAM_H, fsize - low, low };
|
||||
return 2;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
int gpa_open_segs(vmie_mem* m, const char* path, const gpa_seg* segs, int nseg) {
|
||||
const int fd = open(path, O_RDWR);
|
||||
if (fd < 0) {
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
return gpa_map_owned_fd(m, fd, segs, nseg, 0);
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
int gpa_open(vmie_mem* m, const char* path, uintptr_t low) {
|
||||
struct stat st;
|
||||
@@ -126,16 +156,70 @@ int gpa_open(vmie_mem* m, const char* path, uintptr_t low) {
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
const uint64_t fsize = (uint64_t)st.st_size;
|
||||
|
||||
const gpa_seg one[1] = { { 0, fsize, 0 } };
|
||||
const gpa_seg two[2] = { { 0, low, 0 }, { RAM_H, fsize > low ? fsize - low : 0, low } };
|
||||
const gpa_seg* segs = low >= fsize ? one : two;
|
||||
const int nseg = low >= fsize ? 1 : 2;
|
||||
gpa_seg segs[2];
|
||||
const int nseg = low_segs((uint64_t)st.st_size, low, segs);
|
||||
|
||||
return gpa_open_segs(m, path, segs, nseg);
|
||||
}
|
||||
|
||||
/* fd-backed constructors: build a vmie_mem from an already-open file descriptor
|
||||
* instead of a path. The fd is BORROWED via dup() - core owns the copy (closed
|
||||
* in gpa_close); the caller's fd stays valid. The fd must reference an mmap-able
|
||||
* RW object (regular file / memfd / shm); its file position is not used. */
|
||||
__attribute__((cold))
|
||||
int gpa_from_fd_segs(vmie_mem* m, int fd, const gpa_seg* segs, int nseg) {
|
||||
const int dupfd = dup(fd);
|
||||
if (dupfd < 0) {
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
return gpa_map_owned_fd(m, dupfd, segs, nseg, 0);
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
int gpa_from_fd(vmie_mem* m, int fd, uintptr_t low) {
|
||||
struct stat st;
|
||||
if (fstat(fd, &st)) {
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
|
||||
gpa_seg segs[2];
|
||||
const int nseg = low_segs((uint64_t)st.st_size, low, segs);
|
||||
|
||||
return gpa_from_fd_segs(m, fd, segs, nseg);
|
||||
}
|
||||
|
||||
/* read-only twins of gpa_from_fd*: map the borrowed fd PROT_READ and mark the
|
||||
* source read-only (m->ro), so gpa_write/gva_write return -1. Same dup-borrow
|
||||
* semantics (core owns the copy, caller's fd stays valid). Accept O_RDONLY as
|
||||
* well as O_RDWR fds - only read access is required for a PROT_READ mapping.
|
||||
* Reads/gpa_ptr/scan behave exactly as on an RW source. */
|
||||
__attribute__((cold))
|
||||
int gpa_from_ro_fd_segs(vmie_mem* m, int fd, const gpa_seg* segs, int nseg) {
|
||||
const int dupfd = dup(fd);
|
||||
if (dupfd < 0) {
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
return gpa_map_owned_fd(m, dupfd, segs, nseg, 1);
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
int gpa_from_ro_fd(vmie_mem* m, int fd, uintptr_t low) {
|
||||
struct stat st;
|
||||
if (fstat(fd, &st)) {
|
||||
clean_ctx(m);
|
||||
return -1;
|
||||
}
|
||||
|
||||
gpa_seg segs[2];
|
||||
const int nseg = low_segs((uint64_t)st.st_size, low, segs);
|
||||
|
||||
return gpa_from_ro_fd_segs(m, fd, segs, nseg);
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
void gpa_close(vmie_mem* m) {
|
||||
if (m->pa) {
|
||||
@@ -180,6 +264,58 @@ vmie_mem* vmie_mem_open_segs(const char* path, const gpa_seg* segs, int nseg) {
|
||||
return m;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
vmie_mem* vmie_mem_from_fd(int fd, uint64_t low) {
|
||||
vmie_mem* m = calloc(1, sizeof *m);
|
||||
if (!m) {
|
||||
return NULL;
|
||||
}
|
||||
if (gpa_from_fd(m, fd, (uintptr_t)low)) {
|
||||
free(m);
|
||||
return NULL;
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
vmie_mem* vmie_mem_from_fd_segs(int fd, const gpa_seg* segs, int nseg) {
|
||||
vmie_mem* m = calloc(1, sizeof *m);
|
||||
if (!m) {
|
||||
return NULL;
|
||||
}
|
||||
if (gpa_from_fd_segs(m, fd, segs, nseg)) {
|
||||
free(m);
|
||||
return NULL;
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
vmie_mem* vmie_mem_from_ro_fd(int fd, uint64_t low) {
|
||||
vmie_mem* m = calloc(1, sizeof *m);
|
||||
if (!m) {
|
||||
return NULL;
|
||||
}
|
||||
if (gpa_from_ro_fd(m, fd, (uintptr_t)low)) {
|
||||
free(m);
|
||||
return NULL;
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
vmie_mem* vmie_mem_from_ro_fd_segs(int fd, const gpa_seg* segs, int nseg) {
|
||||
vmie_mem* m = calloc(1, sizeof *m);
|
||||
if (!m) {
|
||||
return NULL;
|
||||
}
|
||||
if (gpa_from_ro_fd_segs(m, fd, segs, nseg)) {
|
||||
free(m);
|
||||
return NULL;
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
void vmie_mem_close(vmie_mem* m) {
|
||||
if (!m) {
|
||||
|
||||
@@ -20,6 +20,7 @@ typedef struct vmie_mem {
|
||||
int fd;
|
||||
int nseg;
|
||||
gpa_seg seg[VMIE_MAX_SEGS];
|
||||
int ro; /* source is read-only (gpa_write/gva_write -> -1); 0 = RW */
|
||||
} vmie_mem;
|
||||
|
||||
/* GPA <-> file-offset converters over the segment map.
|
||||
@@ -40,6 +41,15 @@ static inline uintptr_t offset_gpa(const vmie_mem* m, uintptr_t off) {
|
||||
/* guest-physical lifecycle + primitives (gpa.c) */
|
||||
int gpa_open_segs(vmie_mem* m, const char* path, const gpa_seg* segs, int nseg);
|
||||
int gpa_open (vmie_mem* m, const char* path, uintptr_t low);
|
||||
/* fd-backed twins of gpa_open*: build from a borrowed fd (dup'd internally,
|
||||
* caller's fd stays valid) instead of a path. fd must be an mmap-able RW object. */
|
||||
int gpa_from_fd_segs(vmie_mem* m, int fd, const gpa_seg* segs, int nseg);
|
||||
int gpa_from_fd (vmie_mem* m, int fd, uintptr_t low);
|
||||
/* read-only twins of gpa_from_fd*: map the borrowed fd PROT_READ and mark the
|
||||
* source read-only (gpa_write/gva_write -> -1). Accept O_RDONLY as well as
|
||||
* O_RDWR fds (only read access is required). Reads/gpa_ptr/scan behave as RW. */
|
||||
int gpa_from_ro_fd_segs(vmie_mem* m, int fd, const gpa_seg* segs, int nseg);
|
||||
int gpa_from_ro_fd (vmie_mem* m, int fd, uintptr_t low);
|
||||
void gpa_close(vmie_mem* m);
|
||||
int gpa_read (vmie_mem* m, uintptr_t offs, void* dst, size_t nmemb);
|
||||
int gpa_write(vmie_mem* m, uintptr_t offs, const void* src, size_t nmemb);
|
||||
|
||||
+10
-1
@@ -158,7 +158,16 @@ int gva_regions(vmie_mem* m, uintptr_t cr3, uint64_t lo, uint64_t hi,
|
||||
if (!(e4 & PG_P)) continue;
|
||||
const uint64_t b4 = VA_CANON((uint64_t)i4 << 39);
|
||||
if (!rgn_hit(b4, 1ull << 39, lo, hi)) continue;
|
||||
const int rw4 = (e4 >> 1) & 1, us4 = (e4 >> 2) & 1, nx4 = (int)(e4 >> 63) & 1;
|
||||
const int rw4 = (e4 >> 1) & 1, us4 = (e4 >> 2) & 1;
|
||||
/* On a KVA-shadow (KPTI) Windows the kernel CR3 marks user-half PML4Es
|
||||
* NX as hardening: the kernel must not execute user pages through its own
|
||||
* mapping. Ring 3 runs under the user/shadow CR3, which reaches the SAME
|
||||
* lower tables (PDPT/PD/PT are shared) through a PML4E with NX clear, so
|
||||
* that top-level NX is not what executes user code. Drop it on the user
|
||||
* half; sub-PML4E NX stays authoritative (it is shared between the two
|
||||
* CR3s). On a non-KPTI guest a code-covering user PML4E already has NX
|
||||
* clear, so this only ever discards a zero. i4 < 256 == canonical user. */
|
||||
const int nx4 = (i4 < 256) ? 0 : ((int)(e4 >> 63) & 1);
|
||||
|
||||
const uint64_t* t3 = gpa_ptr(m, e4 & PFN_MASK, 4096);
|
||||
if (!t3) continue;
|
||||
|
||||
+65
-22
@@ -6,6 +6,9 @@
|
||||
|
||||
#define MZ 0x5A4Du
|
||||
|
||||
__attribute__((cold))
|
||||
static int host_profile_from_cr3(vmie_win32* v, uintptr_t cr3);
|
||||
|
||||
/* ---- lifecycle (cold) ---------------------------------------------------- */
|
||||
|
||||
__attribute__((cold))
|
||||
@@ -21,6 +24,40 @@ vmie_win32* vmie_win32_open(const char* ram_path, uint64_t low) {
|
||||
return v;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
vmie_win32* vmie_win32_open_fd(int fd, uint64_t low) {
|
||||
vmie_win32* v = calloc(1, sizeof *v);
|
||||
if (!v) {
|
||||
return NULL;
|
||||
}
|
||||
if (gpa_from_fd(&v->mem, fd, low)) {
|
||||
free(v);
|
||||
return NULL;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
/* Read-only consumer context: maps the backing file PROT_READ and builds the
|
||||
* struct-offset profile from the image under the caller-supplied kcr3 (no
|
||||
* beacon, no cr3 recovery, no ACK write). All read APIs work, incl.
|
||||
* proc_list/proc_modules; writes return -1. */
|
||||
__attribute__((cold))
|
||||
vmie_win32* vmie_win32_open_ro_fd(int fd, uint64_t low, uint64_t kcr3) {
|
||||
vmie_win32* v = calloc(1, sizeof *v);
|
||||
if (!v) {
|
||||
return NULL;
|
||||
}
|
||||
if (gpa_from_ro_fd(&v->mem, fd, low)) {
|
||||
free(v);
|
||||
return NULL;
|
||||
}
|
||||
if (host_profile_from_cr3(v, (uintptr_t)kcr3)) {
|
||||
vmie_win32_close(v);
|
||||
return NULL;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
void vmie_win32_close(vmie_win32* v) {
|
||||
if (!v) {
|
||||
@@ -153,6 +190,31 @@ static uint32_t ko_export_rva(vmie_mem* m, uintptr_t cr3, uint64_t kbase, const
|
||||
return 0;
|
||||
}
|
||||
|
||||
__attribute__((cold))
|
||||
static int host_profile_from_cr3(vmie_win32* v, uintptr_t cr3) {
|
||||
vmie_mem* m = &v->mem;
|
||||
uint8_t guid[16];
|
||||
uint32_t age, rva;
|
||||
uint64_t sys_ep, dtb;
|
||||
|
||||
if (find_ntoskrnl(m, cr3, &v->kbase, guid, &age)) {
|
||||
return -3;
|
||||
}
|
||||
rva = ko_export_rva(m, cr3, v->kbase, "PsInitialSystemProcess");
|
||||
if (!rva || gva_read(m, cr3, v->kbase + rva, &sys_ep, 8)) {
|
||||
return -4;
|
||||
}
|
||||
if (profile_build(v, cr3, sys_ep, guid, age)) {
|
||||
return -5;
|
||||
}
|
||||
if (gva_read(m, cr3, sys_ep + v->prof.ep_dtb, &dtb, 8)) {
|
||||
return -6;
|
||||
}
|
||||
v->kcr3 = dtb & PFN_MASK;
|
||||
v->sysproc = sys_ep;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void beacon_ack(vmie_mem* m, uint64_t anchor_pa) {
|
||||
uint64_t ack = CONTRACT_MAGIC_R;
|
||||
gpa_write(m, anchor_pa + offsetof(contract, ack), &ack, 8);
|
||||
@@ -167,10 +229,6 @@ int host_bootstrap(vmie_win32* v) {
|
||||
vmie_mem* m = &v->mem;
|
||||
uint64_t anchor_pa, va_self;
|
||||
uintptr_t cr3boot;
|
||||
uint32_t rva;
|
||||
uint8_t guid[16];
|
||||
uint32_t age;
|
||||
uint64_t sys_ep;
|
||||
|
||||
if (beacon_find(m, &anchor_pa, &va_self)) {
|
||||
return -1;
|
||||
@@ -180,26 +238,11 @@ int host_bootstrap(vmie_win32* v) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
if (find_ntoskrnl(m, cr3boot, &v->kbase, guid, &age)) {
|
||||
return -3;
|
||||
const int rc = host_profile_from_cr3(v, cr3boot);
|
||||
if (rc) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
rva = ko_export_rva(m, cr3boot, v->kbase, "PsInitialSystemProcess");
|
||||
if (!rva || gva_read(m, cr3boot, v->kbase + rva, &sys_ep, 8)) {
|
||||
return -4;
|
||||
}
|
||||
|
||||
if (profile_build(v, cr3boot, sys_ep, guid, age)) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
uint64_t dtb;
|
||||
if (gva_read(m, cr3boot, sys_ep + v->prof.ep_dtb, &dtb, 8)) {
|
||||
return -6;
|
||||
}
|
||||
v->kcr3 = dtb & PFN_MASK;
|
||||
v->sysproc = sys_ep;
|
||||
|
||||
beacon_ack(m, anchor_pa);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -115,10 +115,10 @@ static int xref_sweep_cb(void* u, const uint8_t* data, size_t len,
|
||||
}
|
||||
|
||||
int gva_code_xref(vmie_mem* m, uintptr_t cr3, uint64_t lo, uint64_t hi,
|
||||
uint64_t target_va, uint64_t* out, int max) {
|
||||
uint32_t prot_any, uint64_t target_va, uint64_t* out, int max) {
|
||||
struct xref_cb c; memset(&c, 0, sizeof c);
|
||||
c.target = target_va; c.out = out; c.max = max;
|
||||
if (gva_sweep(m, cr3, lo, hi, VR_X, X86_MAX_INSN, xref_sweep_cb, &c) < 0) {
|
||||
if (gva_sweep(m, cr3, lo, hi, prot_any, X86_MAX_INSN, xref_sweep_cb, &c) < 0) {
|
||||
return -1;
|
||||
}
|
||||
return c.n;
|
||||
|
||||
Reference in New Issue
Block a user