From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9390F2BEC2E for ; Fri, 17 Oct 2025 00:33:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760661207; cv=none; b=IZDh6ZvIvhnj3ixdm1vfmULrm5+oxz7oqc6jZbQDakqJQC0MWWLie6Fm+EAC9vWqRj+Vz6k9fYgL8NdDDgaPFGR1NGNkFOnuFo0QVezpq9OtI9ACNLqrOjpT9uysf9q0U98mTChQKruGFV/kADdBjWjBFFZ7ptpQ5d9Z3tIX1rI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760661207; c=relaxed/simple; bh=7L8ZMSuIkRJTkNiFBvS5epoU4gg7pv9o+BehY7SDauc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=K3J1sYf2r6tc32nxwLSLsA6MCe3E1KpNk8yaMhXqqv+lH0SbtGMhdb3IuhV0Yhg/vcZ/4x6Jg6iOeiNRB2YSxchRxNmD+PWwJB/BsIz9pUpnjLhaeFIX5h/5Z01dQypfCeOSqdJwJE8a8E7l5RPbUd35mjbzSBzmRwD2IeWDbWs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=H6u6nZrc; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="H6u6nZrc" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-32ee4998c50so1124846a91.3 for ; Thu, 16 Oct 2025 17:33:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760661205; x=1761266005; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=G1uT4yQcba8Ntip8LDR4veCehne/0rON+KC3PlpYlbc=; b=H6u6nZrcHJN51i3WUeG53Rzrj8T1f7eACzMjHMh0WKme+NFtTvGOPDxLHVVhcmtoy7 2Db4Ok1vbjE7QV8fK97jci2FzZ6EsvW30DNm+RQ740JDXQDHrWzY1I/CkzUCqogNEN1R bXZs9/F8uluMCSPaAFJcow6sGj6K22JEth1ZcahllBBxfaMXzGb70uZ7bUWC6QfaCIom QLkpTW1E84DE71OEFg+1L0coEwvJUnh79W3i7CbN76838uNB9eu9dS4QBQn3Zb+HbtJy GLImdh1LcvRhgmVQHmH/wntgoqWeKV05Fxp6ingavoLsnjTcm5azo/rCWTuiLGlVs71T XvsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760661205; x=1761266005; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=G1uT4yQcba8Ntip8LDR4veCehne/0rON+KC3PlpYlbc=; b=Eklxl4LsOvc8TXIF3T4Aku3a0pbSKFptQ3Ro18UiiHeV7tDVugMQxl6w7wL/FAaI5/ oDWCFUaDH/C0jsULPvu8odKXbKf0qnfCJQRHxUdQCLSSvqJbgZ42s8fMwz6bRHOYLLrV 4wD+vzfQyQvD8fvy+m3paKsLFHxNFwgzJ205XaiUG7TZkpK0ohHvIhD2rA3Vg6RmJYea 6IULmXI6/hM6jrui1dlLt1IY+1CTMHgrmaJPrZhUTiZZbsN6tuiSEGJysLVZj6dBW7it ZVF56tro987jUmgmYg4AeXcsAB3xspgSnlSZI7uXIn5TvXey7HopEKb8h+2k8QBghXke 7lHA== X-Forwarded-Encrypted: i=1; AJvYcCUIBiMS6gMKOaWObH3Ga5tt+pq3nyVkAoV+BiBMskcYQoJIPSvfQZMmVqrF9uhNsNavYclFwKxzauhY@lists.linux.dev X-Gm-Message-State: AOJu0Yz7udEAdaWA9G0JK4eXqSWdesZfJNk8sd1jcumDU3a9L2obA+dI 4oR1BI3+J1EAg114TUQQdhwQf2RcxZ6GvxqipOB27RpBvLh4+55pY2Hry/N5zlVBq+zjxjRCzxB XeZruLA== X-Google-Smtp-Source: AGHT+IFb3cb9XScIkfIbQA2oQID7nhqxfExRyWF6N5UGcVhE3T71y0SJP1d51io6pNMM6/KZP3XG25y1rx0= X-Received: from pjoa3.prod.google.com ([2002:a17:90a:8c03:b0:32e:a549:83e3]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d8f:b0:335:2eee:19dc with SMTP id 98e67ed59e1d1-33bcf8f94b6mr1826093a91.28.1760661204960; Thu, 16 Oct 2025 17:33:24 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 16 Oct 2025 17:32:39 -0700 In-Reply-To: <20251017003244.186495-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.858.gf9c4a03a3a-goog Message-ID: <20251017003244.186495-22-seanjc@google.com> Subject: [PATCH v3 21/25] KVM: TDX: Add tdx_get_cmd() helper to get and validate sub-ioctl command From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini , "Kirill A. Shutemov" Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Yan Zhao , Vishal Annapurve , Rick Edgecombe , Ackerley Tng , Binbin Wu Content-Type: text/plain; charset="UTF-8" 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. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 2e2dab89c98f..d5f810435f34 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -2761,20 +2761,25 @@ 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; + + 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); @@ -3152,11 +3157,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: -- 2.51.0.858.gf9c4a03a3a-goog