Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3539335ybt; Tue, 23 Jun 2020 05:00:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFT7KTWRynlH8nUM3NN3udZWL4S9F7DND3PaeEoXV2XzG7aKAoLAGqbZYOaqSlg5pB9SPF X-Received: by 2002:a17:906:8417:: with SMTP id n23mr6469765ejx.192.1592913633410; Tue, 23 Jun 2020 05:00:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592913633; cv=none; d=google.com; s=arc-20160816; b=u1Xuz2Jhjjk1602Dy+vCs2kUv4VyXfTHixrZ3ueGSJZSvmGIHqEOZF2JoHodqm/Y1Z Rik3g1DKrF/0H9FXKvCB4rmI4Q8qwLNBlOyiSG/4lHnFRh14UsKbYRHbRrf3X1Q+MXq2 AtLj3uaHYnZ/gRLyNDf8BZobFNNANa5c+t3Rm9apT3Xgofp5CY3NNh6KGA9V9mVD9Mge DpHd2FoMrxOcjkYVV4P2DicGDNgeu/wdm43/rv9JuhyPZ20LOws5KJpHXRatrhTrvBSf QPmZUaiiVpLIi2ygcbmvFbC86eBeqUlL7I9tVlsQFHM4gFqdumb2CJKFQJroDuljkMmV WHKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=fCjI+Pi12v2BBjlxtb8WeIzwgbk2feaPXEyBT/45APc=; b=uQCWbSA4E9JOB7NjOL2+vf4bIfjgO8renh8KPSoOrJLM4DYDZnZvLNua2XuXmnR6JY e813w4qsakq14PvAQ+CyTmlfg33mTxH18kO7JlzUJNmeyHEWQOQ/TyPzrEBC1w+zJBEx meUbEy0YrmUGzrlUBnCHvTbo+RU8RTwHep0VyjY2ZGjL+vfSgq35J/1x50wRZHf9V29V cgI0uqbQSGp7OuEIVc3SbUzEa+Z0SDmbdnzEerbhJgY15lPVWdoJhiqPi2CsoZmXj5ev 2tAlmAtCSqfSiAtmyK5iEHt74mjfJHHronIP7Sj1uRfmc+lOxpDquukLfDgBXDw4tx+5 9F5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r16si5800686edo.473.2020.06.23.05.00.10; Tue, 23 Jun 2020 05:00:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732538AbgFWL6Y (ORCPT + 99 others); Tue, 23 Jun 2020 07:58:24 -0400 Received: from mga05.intel.com ([192.55.52.43]:58474 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732364AbgFWL6Y (ORCPT ); Tue, 23 Jun 2020 07:58:24 -0400 IronPort-SDR: bnkQ12CZuUHAwuve9KzbHcNOCrE0T56NUMctU2PkB5y7Rn4HM6xU6O5sllJZATmIgvALOO3xq7 NhdrHmW6HaFg== X-IronPort-AV: E=McAfee;i="6000,8403,9660"; a="228710034" X-IronPort-AV: E=Sophos;i="5.75,271,1589266800"; d="scan'208";a="228710034" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2020 04:58:23 -0700 IronPort-SDR: qptkiFY9mzn1oJIiSEjbe6MsnPiPaMjdFMI/J/dgVDyy8cDOsUAdDbzlZbKr8yFOdewfLcubsE y68dUnbyL6zQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,271,1589266800"; d="scan'208";a="285745184" Received: from lxy-dell.sh.intel.com ([10.239.159.21]) by orsmga007.jf.intel.com with ESMTP; 23 Jun 2020 04:58:20 -0700 From: Xiaoyao Li To: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov Cc: Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [PATCH v2 1/7] KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID fails Date: Tue, 23 Jun 2020 19:58:10 +0800 Message-Id: <20200623115816.24132-2-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200623115816.24132-1-xiaoyao.li@intel.com> References: <20200623115816.24132-1-xiaoyao.li@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It needs to invalidate CPUID configruations if usersapce provides illegal input. Signed-off-by: Xiaoyao Li --- arch/x86/kvm/cpuid.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 8a294f9747aa..1d13bad42bf9 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -207,6 +207,8 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, kvm_apic_set_version(vcpu); kvm_x86_ops.cpuid_update(vcpu); r = kvm_update_cpuid(vcpu); + if (r) + vcpu->arch.cpuid_nent = 0; kvfree(cpuid_entries); out: @@ -230,6 +232,8 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, kvm_apic_set_version(vcpu); kvm_x86_ops.cpuid_update(vcpu); r = kvm_update_cpuid(vcpu); + if (r) + vcpu->arch.cpuid_nent = 0; out: return r; } -- 2.18.2