A VMM can offer FEAT_TCR2 to a guest but hide FEAT_S1PIE or FEAT_S1POE, for example this is done to keep the VM migratable. KVM then stops loading the PIR_EL1, PIRE0_EL1 and POR_EL1 registers for that guest. But the guest's writes to the TCR2_EL1 register don't trap, and the CPU still acts on its PIE, POE and E0POE bits. If a guest turned these features on, it would run with the permission settings another VM left on the CPU. Technically this is a kind of information leak and a guest could figure out another guests permission setting based on which accesses fault. For these VMs, set the TCR_EL1 bit in HFGWTR_EL2 so that writes to TCR_EL1 and TCR2_EL1 trap, and clear the hidden bits in a new access_tcr2_el1() handler. Fixes: 58627b722ee2 ("KVM: arm64: Make PIR{,E0}_EL1 UNDEF if S1PIE is not advertised to the guest") Fixes: b86c9bea6349 ("KVM: arm64: Save/restore POE registers") Cc: stable@vger.kernel.org Signed-off-by: Dan Carpenter --- v2: This is a new patch This is only a partial fix, I will update nested virtualization in the next patch and the !vcpu_has_nv(vcpu) condition in __compute_hfgwtr() will go away. --- arch/arm64/kvm/config.c | 5 +++++ arch/arm64/kvm/sys_regs.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c index e295435a30b8..f756f7c4fdf8 100644 --- a/arch/arm64/kvm/config.c +++ b/arch/arm64/kvm/config.c @@ -1896,6 +1896,11 @@ static void __compute_hfgwtr(struct kvm_vcpu *vcpu) if (cpus_have_final_cap(ARM64_WORKAROUND_AMPERE_AC03_CPU_38)) *vcpu_fgt(vcpu, HFGWTR_EL2) |= HFGWTR_EL2_TCR_EL1; + + /* The CPU acts on hidden TCR2_EL1 bits, so trap writes to clear them */ + if (!vcpu_has_nv(vcpu) && kvm_has_tcr2(vcpu->kvm) && + (!kvm_has_s1pie(vcpu->kvm) || !kvm_has_s1poe(vcpu->kvm))) + *vcpu_fgt(vcpu, HFGWTR_EL2) |= HFGWTR_EL2_TCR_EL1; } static void __compute_hdfgwtr(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index afd7e76bedff..3899702d438b 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -615,6 +615,18 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu, return true; } +static bool access_tcr2_el1(struct kvm_vcpu *vcpu, + struct sys_reg_params *p, + const struct sys_reg_desc *r) +{ + if (!kvm_has_s1pie(vcpu->kvm)) + p->regval &= ~TCR2_EL1_PIE; + if (!kvm_has_s1poe(vcpu->kvm)) + p->regval &= ~(TCR2_EL1_POE | TCR2_EL1_E0POE); + + return access_vm_reg(vcpu, p, r); +} + static bool access_actlr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) @@ -3501,7 +3513,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_TTBR0_EL1), access_vm_reg, reset_unknown, TTBR0_EL1 }, { SYS_DESC(SYS_TTBR1_EL1), access_vm_reg, reset_unknown, TTBR1_EL1 }, { SYS_DESC(SYS_TCR_EL1), access_vm_reg, reset_val, TCR_EL1, 0 }, - { SYS_DESC(SYS_TCR2_EL1), access_vm_reg, reset_val, TCR2_EL1, 0, + { SYS_DESC(SYS_TCR2_EL1), access_tcr2_el1, reset_val, TCR2_EL1, 0, .visibility = tcr2_visibility }, PTRAUTH_KEY(APIA), -- 2.53.0