From nobody Tue Sep 9 01:03:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC899EB64DA for ; Thu, 20 Jul 2023 23:33:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230108AbjGTXdq (ORCPT ); Thu, 20 Jul 2023 19:33:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbjGTXdW (ORCPT ); Thu, 20 Jul 2023 19:33:22 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA449273A; Thu, 20 Jul 2023 16:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689895996; x=1721431996; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=54f6oGhMQOvzfr4uV0Pwhmi/Poh/uRJMyo79eGxiezU=; b=BlOfBC6SMptz3gZ5eLCSfnFKDivgO+dvCKtAsnh9cRZkEvuBs1un6czK dRbmCIBhAD6mlRv97G0MTCprlutpq9qsO9dOVIcnVo8aUPBC74g/xFn++ Wq9OYi7qzHCJKxQPfoAXaT63kaWlHA9B8yl2FFM70W+iunVANMh5rByvM VBd0d2g48j6WIDowFGjtE4xMXXqMhclGtPDlHr3SoK4qMbS4G1Fx1saZs 96i7qcvdgz3svzO5fWT/1wK1BBChLcaaLl6PJYCDorx9RW6rdERtkf7OS Tc0mbb7oabIFUD2cu60+4Pm7wfI9HZC2L5KqOz6Mas0uF46crJ616gMud A==; X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="364355976" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="364355976" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 16:33:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="727891811" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="727891811" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 16:33:13 -0700 From: isaku.yamahata@intel.com To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Michael Roth , Paolo Bonzini , Sean Christopherson , erdemaktas@google.com, Sagi Shahar , David Matlack , Kai Huang , Zhi Wang , chen.bo@intel.com, linux-coco@lists.linux.dev, Chao Peng , Ackerley Tng , Vishal Annapurve , Yuan Yao Subject: [RFC PATCH v4 10/10] KVM: X86: KVM_MEM_ENC_OP check if unused field (flags, error) is zero Date: Thu, 20 Jul 2023 16:32:56 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata This breaks uABI as the current code doesn't check padding and sev_fd when unused. Signed-off-by: Isaku Yamahata --- Changes v3 -> v4: - newly added --- arch/x86/kvm/x86.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ab36e8940f1b..1d6085af6a00 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7055,6 +7055,22 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned in= t ioctl, unsigned long arg) r =3D -EFAULT; goto out; } + /* No sub-command uses flags at the moment. */ + if (cmd.flags) { + r =3D -EINVAL; + goto out; + } + if (cmd.id !=3D KVM_SEV_LAUNCH_START && + cmd.id !=3D KVM_SEV_RECEIVE_START && cmd.error64) { + r =3D -EINVAL; + goto out; + } + if ((cmd.id =3D=3D KVM_SEV_LAUNCH_START || + cmd.id =3D=3D KVM_SEV_RECEIVE_START) && cmd.error) { + r =3D -EINVAL; + goto out; + } + r =3D static_call(kvm_x86_mem_enc_ioctl)(kvm, &cmd); if (copy_to_user(argp, &cmd, sizeof(cmd))) r =3D -EFAULT; --=20 2.25.1