diff options
| author | Alexander Potapenko <glider@google.com> | 2024-09-06 10:07:23 +0200 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2024-09-06 12:52:17 +0000 |
| commit | ce70880ae710f930d895ac30e0df025cc005eb19 (patch) | |
| tree | 73317bf9159fcae856afd747eb7f2d982b0dc608 /executor | |
| parent | a72ab0ee0af4b1d0d401c09436e1e9ff04bc46e6 (diff) | |
executor: sys/linux: arm64: implement SYZOS_API_MEMWRITE
The new API call will be used to write values to guest memory specified
by base+offset.
Writing to e.g. MMIO registers for VGIC (or any other MMIO ranges) may
result in new coverage.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_kvm_arm64_syzos.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/executor/common_kvm_arm64_syzos.h b/executor/common_kvm_arm64_syzos.h index 183e35342..0f11a7b00 100644 --- a/executor/common_kvm_arm64_syzos.h +++ b/executor/common_kvm_arm64_syzos.h @@ -19,6 +19,7 @@ typedef enum { SYZOS_API_SMC, SYZOS_API_HVC, SYZOS_API_IRQ_SETUP, + SYZOS_API_MEMWRITE, SYZOS_API_STOP, // Must be the last one } syzos_api_id; @@ -54,12 +55,21 @@ struct api_call_irq_setup { uint32 nr_spis; }; +struct api_call_memwrite { + struct api_call_header header; + uint64 base_addr; + uint64 offset; + uint64 value; + uint64 len; +}; + static void guest_uexit(uint64 exit_code); static void guest_execute_code(uint32* insns, uint64 size); static void guest_handle_msr(uint64 reg, uint64 val); static void guest_handle_smc(struct api_call_smccc* cmd); static void guest_handle_hvc(struct api_call_smccc* cmd); static void guest_handle_irq_setup(struct api_call_irq_setup* cmd); +static void guest_handle_memwrite(struct api_call_memwrite* cmd); typedef enum { UEXIT_END = (uint64)-1, @@ -107,6 +117,10 @@ GUEST_CODE static void guest_main(uint64 size) guest_handle_irq_setup((struct api_call_irq_setup*)cmd); break; } + case SYZOS_API_MEMWRITE: { + guest_handle_memwrite((struct api_call_memwrite*)cmd); + break; + } } addr += cmd->size; size -= cmd->size; @@ -467,6 +481,35 @@ GUEST_CODE static void guest_handle_irq_setup(struct api_call_irq_setup* cmd) : "x1"); } +GUEST_CODE static void guest_handle_memwrite(struct api_call_memwrite* cmd) +{ + uint64 dest = cmd->base_addr + cmd->offset; + switch (cmd->len) { + case 1: { + volatile uint8* p = (uint8*)dest; + *p = (uint8)cmd->value; + break; + } + + case 2: { + volatile uint16* p = (uint16*)dest; + *p = (uint16)cmd->value; + break; + } + case 4: { + volatile uint32* p = (uint32*)dest; + *p = (uint32)cmd->value; + break; + } + case 8: + default: { + volatile uint64* p = (uint64*)dest; + *p = (uint64)cmd->value; + break; + } + } +} + // Registers saved by one_irq_handler() and received by guest_irq_handler(). struct ex_regs { uint64 regs[31]; |
