summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2024-08-13 12:06:27 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2024-08-13 12:06:27 +0200
commit747cfbf161a5bc292ce194bfce6ab1a2d5e60b40 (patch)
tree7fd043574a9f78faea1d4f5c7eb789ecb0a316c0 /tools
parentKVM: SVM: Fix uninitialized variable bug (diff)
parentKVM: arm64: vgic: Hold config_lock while tearing down a CPU interface (diff)
downloadlinux-747cfbf161a5bc292ce194bfce6ab1a2d5e60b40.tar.xz
linux-747cfbf161a5bc292ce194bfce6ab1a2d5e60b40.zip
Merge tag 'kvmarm-fixes-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.11, round #1 - Use kvfree() for the kvmalloc'd nested MMUs array - Set of fixes to address warnings in W=1 builds - Make KVM depend on assembler support for ARMv8.4 - Fix for vgic-debug interface for VMs without LPIs - Actually check ID_AA64MMFR3_EL1.S1PIE in get-reg-list selftest - Minor code / comment cleanups for configuring PAuth traps - Take kvm->arch.config_lock to prevent destruction / initialization race for a vCPU's CPUIF which may lead to a UAF
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/kvm/aarch64/get-reg-list.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
index 709d7d721760..4abebde78187 100644
--- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c
+++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
@@ -32,13 +32,13 @@ static struct feature_id_reg feat_id_regs[] = {
{
ARM64_SYS_REG(3, 0, 10, 2, 2), /* PIRE0_EL1 */
ARM64_SYS_REG(3, 0, 0, 7, 3), /* ID_AA64MMFR3_EL1 */
- 4,
+ 8,
1
},
{
ARM64_SYS_REG(3, 0, 10, 2, 3), /* PIR_EL1 */
ARM64_SYS_REG(3, 0, 0, 7, 3), /* ID_AA64MMFR3_EL1 */
- 4,
+ 8,
1
}
};