diff options
| author | Alexander Potapenko <glider@google.com> | 2024-08-06 14:59:07 +0200 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2024-08-07 16:00:37 +0000 |
| commit | f89fe08c7227fc4fa4bc40ab8d0e1eacca6c20f0 (patch) | |
| tree | 34d74e658913731252b27f9eb1dc25063bd26d35 | |
| parent | 0020fc2034b4113f0e6c59ba408795e2b63d5e43 (diff) | |
executor: arm64: add SYZOS_API_SMC
Provide an API call to invoke the ARM64 Secure Monitor Call instruction
with user-supplied function id and 5 parameters passed in registers x1-x5.
For now only `smc #0` is invoked, although in the future we may want to
pass other (reserved) immediate values to SMC.
| -rw-r--r-- | executor/common_kvm_arm64_syzos.h | 36 | ||||
| -rw-r--r-- | sys/linux/dev_kvm.txt | 17 | ||||
| -rw-r--r-- | sys/linux/test/syz_kvm_setup_cpu_arm64-smc | 15 |
3 files changed, 68 insertions, 0 deletions
diff --git a/executor/common_kvm_arm64_syzos.h b/executor/common_kvm_arm64_syzos.h index 1541a2b58..104a07945 100644 --- a/executor/common_kvm_arm64_syzos.h +++ b/executor/common_kvm_arm64_syzos.h @@ -16,6 +16,7 @@ typedef enum { SYZOS_API_UEXIT, SYZOS_API_CODE, SYZOS_API_MSR, + SYZOS_API_SMC, SYZOS_API_STOP, // Must be the last one } syzos_api_id; @@ -39,9 +40,16 @@ struct api_call_code { uint32 insns[]; }; +struct api_call_smc { + struct api_call_header header; + uint32 smc_id; + uint64 params[5]; +}; + 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_smc* cmd); // Main guest function that performs necessary setup and passes the control to the user-provided // payload. @@ -71,6 +79,10 @@ GUEST_CODE static void guest_main(uint64 size) guest_handle_msr(ccmd->args[0], ccmd->args[1]); break; } + case SYZOS_API_SMC: { + guest_handle_smc((struct api_call_smc*)cmd); + break; + } } addr += cmd->size; size -= cmd->size; @@ -121,3 +133,27 @@ guest_handle_msr(uint64 reg, uint64 val) : [val] "r"(val), [pc] "r"(insn) : "x0", "x30", "memory"); } + +// See "SMC Calling Convention", https://documentation-service.arm.com/static/5f8ea482f86e16515cdbe3c6 +GUEST_CODE static void guest_handle_smc(struct api_call_smc* cmd) +{ + asm volatile( + "mov x0, %[smc_id]\n" + "mov x1, %[arg1]\n" + "mov x2, %[arg2]\n" + "mov x3, %[arg3]\n" + "mov x4, %[arg4]\n" + "mov x5, %[arg5]\n" + // TODO(glider): it could be interesting to pass other immediate values here, although + // they are ignored as per the calling convention. + "smc #0\n" + : // Ignore the outputs for now + : [smc_id] "r"((uint32)cmd->smc_id), + [arg1] "r"(cmd->params[0]), [arg2] "r"(cmd->params[1]), + [arg3] "r"(cmd->params[2]), [arg4] "r"(cmd->params[3]), + [arg5] "r"(cmd->params[4]) + : "x0", "x1", "x2", "x3", "x4", "x5", + // These registers are not used above, but may be clobbered by the SMC call. + "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", + "memory"); +} diff --git a/sys/linux/dev_kvm.txt b/sys/linux/dev_kvm.txt index 2066b8d78..4b702ed29 100644 --- a/sys/linux/dev_kvm.txt +++ b/sys/linux/dev_kvm.txt @@ -268,10 +268,27 @@ syzos_api_msr { arg_value int64 } +# Based on the "SMC Calling Convention" doc, https://documentation-service.arm.com/static/5f8ea482f86e16515cdbe3c6 +# Bit 31 is Standard (0) / Fast Call (1) +# Bit 30 is SMC32 (0) / SMC64 (1) +# Bits 29:24 denote the owning entity (relevant constants below are 0x01000000-0x3f000000 +# Bits 23:16 are ignored (must be zero in most cases) +# Bits 15:0 denote the function number (0-0xffff) within the specified range, so we list all the possible bit values +# here and hope that the fuzzer will be able to combine them into a number. +kvm_smc_id = 0x80000000, 0x40000000, 0x1000000, 0x2000000, 0x3000000, 0x4000000, 0x30000000, 0x31000000, 0x32000000, 0x3f000000, 0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0xffff + +syzos_api_smc { + call const[3, int64] + size bytesize[parent, int64] + arg_id flags[kvm_smc_id, int32] + arg_params array[int64, 5] +} + syzos_api_call [ uexit syzos_api_uexit code syzos_api_code msr syzos_api_msr + smc syzos_api_smc ] [varlen] kvm_text_ppc64 { diff --git a/sys/linux/test/syz_kvm_setup_cpu_arm64-smc b/sys/linux/test/syz_kvm_setup_cpu_arm64-smc new file mode 100644 index 000000000..77588b1cb --- /dev/null +++ b/sys/linux/test/syz_kvm_setup_cpu_arm64-smc @@ -0,0 +1,15 @@ +# +# requires: arch=arm64 +# +r0 = openat$kvm(0, &AUTO='/dev/kvm\x00', 0x0, 0x0) +r1 = ioctl$KVM_CREATE_VM(r0, AUTO, 0x0) +# +# KVM_SET_DEVICE_ATTR: group=KVM_ARM_VM_SMCCC_CTRL, attr=KVM_ARM_VM_SMCCC_FILTER +# Filter: base=0xef000000, nr_functions=0x1000, action=KVM_SMCCC_FILTER_FWD_TO_USER +# (Per SMC Calling Convention, 0xef000000-0xef001000 is an SMC64 fast call reserved range) +# +ioctl$KVM_SET_DEVICE_ATTR_vm(r1, AUTO, &AUTO=@attr_arm64={0x0, 0x0, 0x0, &AUTO={0xef000000, 0x1000, 0x2, ""}}) + +r2 = ioctl$KVM_CREATE_VCPU(r1, AUTO, 0x0) +syz_kvm_setup_cpu$arm64(r1, r2, &(0x7f0000e8a000/0x18000)=nil, &AUTO=[{0x0, &AUTO=[@smc={AUTO, AUTO, 0xef000000, [0x0, 0x1, 0x2, 0x3, 0x4]}], AUTO}], 0x1, 0x0, 0x0, 0x0) +ioctl$KVM_RUN(r2, AUTO, 0x0) |
