aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux/test
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2024-09-26 15:32:16 +0200
committerAlexander Potapenko <glider@google.com>2024-09-27 10:23:24 +0000
commit0c245ee318d7cb7257960c447754cfcbb3eec4f6 (patch)
tree3af2c32020ca17c8edc1446760e24e0ec68231e8 /sys/linux/test
parent9314348adf7605682d49192fa6487aac93f5782b (diff)
sys/linux: use GICD/GICR register offsets in SYZOS_API_MEMWRITE
In addition to random offsets passed to SYZOS_API_MEMWRITE, use VGICv3 distributor/redistributor base and offsets of the corresponding registers.
Diffstat (limited to 'sys/linux/test')
-rw-r--r--sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite2
-rw-r--r--sys/linux/test/syz_kvm_setup_cpu_arm64-memwrite2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite
index 0aaf2a6eb..69f0b176f 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite
@@ -6,7 +6,7 @@ r1 = ioctl$KVM_CREATE_VM(r0, AUTO, 0x0)
r2 = syz_kvm_setup_syzos_vm(r1)
# Emulate a uexit with the memwrite API command: write 0 at address ARM64_ADDR_UEXIT.
#
-r3 = syz_kvm_add_vcpu(r2, &AUTO={0x0, &AUTO=[@memwrite={AUTO, AUTO, {0xdddd0000, 0x100, 0x0, 0x8}}], AUTO}, 0x0, 0x0)
+r3 = syz_kvm_add_vcpu(r2, &AUTO={0x0, &AUTO=[@memwrite={AUTO, AUTO, @generic={0xdddd0000, 0x100, 0x0, 0x8}}], AUTO}, 0x0, 0x0)
r4 = ioctl$KVM_GET_VCPU_MMAP_SIZE(r0, AUTO)
r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
diff --git a/sys/linux/test/syz_kvm_setup_cpu_arm64-memwrite b/sys/linux/test/syz_kvm_setup_cpu_arm64-memwrite
index 00b866dd2..99d38dc69 100644
--- a/sys/linux/test/syz_kvm_setup_cpu_arm64-memwrite
+++ b/sys/linux/test/syz_kvm_setup_cpu_arm64-memwrite
@@ -8,7 +8,7 @@ r3 = ioctl$KVM_GET_VCPU_MMAP_SIZE(r0, AUTO)
r4 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r3, 0x3, 0x1, r2, 0x0)
# Emulate a uexit with the memwrite API command: write 0 at address ARM64_ADDR_UEXIT.
#
-syz_kvm_setup_cpu$arm64(r1, r2, &(0x7f0000e8a000/0x18000), &AUTO=[{0x0, &AUTO=[@memwrite={AUTO, AUTO, {0xdddd0000, 0x100, 0x0, 0x8}}], AUTO}], 0x1, 0x0, 0x0, 0x0)
+syz_kvm_setup_cpu$arm64(r1, r2, &(0x7f0000e8a000/0x18000), &AUTO=[{0x0, &AUTO=[@memwrite={AUTO, AUTO, @generic={0xdddd0000, 0x100, 0x0, 0x8}}], AUTO}], 0x1, 0x0, 0x0, 0x0)
# Run till uexit.
#
ioctl$KVM_RUN(r2, AUTO, 0x0)