github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

KVM: TDX: Add tdx_get_cmd() helper to get and validate sub-ioctl command

Browse Source 
Add a helper to copy a kvm_tdx_cmd structure from userspace and verify
that must-be-zero fields are indeed zero.

No functional change intended.

Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com>
Reviewed-by: Yan Zhao <yan.y.zhao@intel.com>
Tested-by: Yan Zhao <yan.y.zhao@intel.com>
Tested-by: Kai Huang <kai.huang@intel.com>
Link: https://patch.msgid.link/20251030200951.3402865-23-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Sean Christopherson 2025-10-30 13:09:45 -07:00
parent 3d626ce5a8
commit 59d5c1ed6d
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/x86/kvm/vmx/tdx.c
View File

@ -2792,20 +2792,29 @@ static int tdx_td_finalize(struct kvm *kvm, struct kvm_tdx_cmd *cmd)
return 0;
}
static int tdx_get_cmd(void __user *argp, struct kvm_tdx_cmd *cmd)
{
if (copy_from_user(cmd, argp, sizeof(*cmd)))
return -EFAULT;
/*
* Userspace should never set hw_error. KVM writes hw_error to report
* hardware-defined error back to userspace.
*/
if (cmd->hw_error)
return -EINVAL;
return 0;
}
int tdx_vm_ioctl(struct kvm *kvm, void __user *argp)
{
struct kvm_tdx_cmd tdx_cmd;
int r;
if (copy_from_user(&tdx_cmd, argp, sizeof(struct kvm_tdx_cmd)))
return -EFAULT;
/*
* Userspace should never set hw_error. It is used to fill
* hardware-defined error by the kernel.
*/
if (tdx_cmd.hw_error)
return -EINVAL;
r = tdx_get_cmd(argp, &tdx_cmd);
if (r)
return r;
mutex_lock(&kvm->lock);
@ -3181,11 +3190,9 @@ int tdx_vcpu_ioctl(struct kvm_vcpu *vcpu, void __user *argp)
if (!is_hkid_assigned(kvm_tdx) || kvm_tdx->state == TD_STATE_RUNNABLE)
return -EINVAL;
if (copy_from_user(&cmd, argp, sizeof(cmd)))
return -EFAULT;
if (cmd.hw_error)
return -EINVAL;
ret = tdx_get_cmd(argp, &cmd);
if (ret)
return ret;
switch (cmd.id) {
case KVM_TDX_INIT_VCPU: