KVM: VMX: Ensure unused kvm_tdx_capabilities fields are zeroed out
Subsystems (4)
Sean Christopherson
maintainerPATCH 1/1 KVM: VMX: Ensure unused kvm_tdx_capabilities fields are zeroed out
Zero-allocate the kernel's kvm_tdx_capabilities structure and copy only the number of CPUID entries from the userspace structure. As is, KVM doesn't ensure kernel_tdvmcallinfo_1_{r11,r12} and user_tdvmcallinfo_1_r12 are zeroed, i.e. KVM will reflect whatever happens to be in the userspace structure back at usersepace, and thus may report garbage to userspace.
Zeroing the entire kernel structure also provides better semantics for the reserved field. E.g. if KVM extends kvm_tdx_capabilities to enumerate new information by repurposing bytes from the reserved field, userspace would be required to zero the new field in order to get useful information back (because older KVMs without support for the repurposed field would report garbage, a la the aforementioned tdvmcallinfo bugs).
--- arch/x86/kvm/vmx/tdx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/tdx.c +4 -3
@@ -2271,25 +2271,26 @@ static int tdx_get_capabilities(struct kvm_tdx_cmd *cmd)const struct tdx_sys_info_td_conf *td_conf = &tdx_sysinfo->td_conf;struct kvm_tdx_capabilities __user *user_caps;struct kvm_tdx_capabilities *caps =NULL ; +u32 nr_user_entries;int ret =0 ;/* flags is reserved for future use */ if (cmd->flags)return -EINVAL ; - caps =kmalloc (sizeof (*caps) + + caps =kzalloc (sizeof (*caps) +sizeof (struct kvm_cpuid_entry2 ) * td_conf->num_cpuid_config,GFP_KERNEL );if (!caps)return -ENOMEM ; user_caps =u64_to_user_ptr (cmd->data); -if (copy_from_user (caps, user_caps,sizeof (*caps))) { +if (get_user (nr_user_entries, &user_caps->cpuid.nent)) { ret = -EFAULT ; goto out; } -if (caps->cpuid.nent < td_conf->num_cpuid_config) { +if (nr_user_entries < td_conf->num_cpuid_config) { ret = -E2BIG ; goto out; }
base-commit: 4578a747f3c7950be3feb93c2db32eb597a3e55b
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
Quoted 5 lines · Sean Christopherson
Zero-allocate the kernel's
kvm_tdx_capabilitiesstructure and copy only the number of CPUID entries from the userspace structure. As is, KVM doesn't ensure kernel_tdvmcallinfo_1_{r11,r12} anduser_tdvmcallinfo_1_r12are zeroed, i.e. KVM will reflect whatever happens to be in the userspace structure back at usersepace, and thus may report garbage to userspace.
^typo
Quoted 8 lines
Zeroing the entire kernel structure also provides better semantics for the reserved field. E.g. if KVM extends
kvm_tdx_capabilitiesto enumerate new information by repurposing bytes from the reserved field, userspace would be required to zero the new field in order to get useful information back (because older KVMs without support for the repurposed field would report garbage, a la the aforementioned tdvmcallinfo bugs).
Quoted 7 lines
Fixes 61bb28279623 ("KVM: TDX: Get system-wide info about TDX module on initialization")Suggested-by Rick Edgecombe <[email protected]>Reported-by Xiaoyao Li <[email protected]>Tested-by Xiaoyao Li <[email protected]>Reviewed-by Xiaoyao Li <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Thanks Sean!
Quoted 6 lines · Sean Christopherson
Zero-allocate the kernel's
kvm_tdx_capabilitiesstructure and copy only the number of CPUID entries from the userspace structure. As is, KVM doesn't ensure kernel_tdvmcallinfo_1_{r11,r12} anduser_tdvmcallinfo_1_r12are zeroed, i.e. KVM will reflect whatever happens to be in the userspace structure back at usersepace, and thus may report garbage to userspace.
Quoted 8 lines
Zeroing the entire kernel structure also provides better semantics for the reserved field. E.g. if KVM extends
kvm_tdx_capabilitiesto enumerate new information by repurposing bytes from the reserved field, userspace would be required to zero the new field in order to get useful information back (because older KVMs without support for the repurposed field would report garbage, a la the aforementioned tdvmcallinfo bugs).[...]
Applied to kvm-x86 fixes, (with the typo fixed), thanks!
[1/1] KVM: VMX: Ensure unused kvm_tdx_capabilities fields are zeroed out
https://github.com/kvm-x86/linux/commit/b8be70ec2b47