From patchwork Thu Nov 3 13:57:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 14903 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp550930wru; Thu, 3 Nov 2022 07:03:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7TrR0yaS9uBJ7mO3kbr5pUZ3nd3AMZ7xrVVQ1ae3LOUoW0hIK0Pt2o/q+99072Ra/tv6mr X-Received: by 2002:a17:902:ebc4:b0:186:b32c:4ce5 with SMTP id p4-20020a170902ebc400b00186b32c4ce5mr30106481plg.74.1667484200403; Thu, 03 Nov 2022 07:03:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667484200; cv=none; d=google.com; s=arc-20160816; b=fEIJcV3TIPpYzboW3W722deGaEj1KfM9DLV1RzOPOqCKZAkzeBxflgtw14+TtQc51e 2A6B0n8ndgArycZgmrexelGq2pFyMVPjj8v7BT9wd/wUV44H/07kKxfPqojVJeUHuZOp YkvIZ/5wymYYgp6PS0rRnEr7dBEY9r7JrLHfn4kSuqjHFqKeRxdMiw1F+mQ+TOc1kCH0 15bGjyZpBrOu7qjCT9tWjgDy8ElxUmAd6OXSrZ1I83NGVQCDMJOCJgQaqzVg/rIzw/GP hGas4t4suN1xfNjR31mkJ15nrQFswWgQwtm6JUYQbbt4Mri22UCpoh7Uam24pH6E1qk7 CcOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZLirfmVsMl7Z8L0J+XcE1Zsp+gCHNtOKzvKZLLJ8RdA=; b=ogOQhLglPTSqNpojJV4sdvtnFaRjHXvU/+f9JltZw68PKRd2eq1bSNP3Oke4vsl7A7 ogXgttELMYKDZP1F6RN6YRShN3S9+9jy34wGSKwhAG2rkyarGee7kcHH+Zbr/drgQlfZ YXN5IZxp94OE/6GV+iMoOX53Si8uRLvF+XZ2Fsj6oejU0g0k9xdxOYdn16qBo6mYkty9 ZZoQoet7RFnBtRXNVYIznWMs3ZZCuOEqUu4coLfICRwsM9RiBMYyoBkJh8xdsmnEECDl jWJ60ccs/smGdZo2ATtmJ4QlIYmX/6g56kFsvHCYFN7XMfQ7ByT5cpr3RBlojj7rkKFD qYrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GYmun3fF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j190-20020a638bc7000000b004701d95bcf8si1185251pge.564.2022.11.03.07.03.01; Thu, 03 Nov 2022 07:03:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GYmun3fF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231300AbiKCN7Q (ORCPT + 99 others); Thu, 3 Nov 2022 09:59:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231671AbiKCN64 (ORCPT ); Thu, 3 Nov 2022 09:58:56 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4441B1402D for ; Thu, 3 Nov 2022 06:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667483874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZLirfmVsMl7Z8L0J+XcE1Zsp+gCHNtOKzvKZLLJ8RdA=; b=GYmun3fF0WOCUTTblZxpN+hX+38RSWMN/OTPBucV6NgBonqtj2Mp+ldWZ9mtwl5D/067tA 0rx6C7ciJPPOSJXQMVCc2yatOj9f8P/rq/wQiUWAm6K9dTMtey5leTDKDurywb5sSh4w6u +FtE86Z8bdgBv4TBBUk6U2j1fZVbQBA= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-271-J74K2mJrOAGRjdR_58cgEA-1; Thu, 03 Nov 2022 09:57:50 -0400 X-MC-Unique: J74K2mJrOAGRjdR_58cgEA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F6B33C0DDD0; Thu, 3 Nov 2022 13:57:49 +0000 (UTC) Received: from amdlaptop.tlv.redhat.com (dhcp-4-238.tlv.redhat.com [10.35.4.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1F3040C2087; Thu, 3 Nov 2022 13:57:44 +0000 (UTC) From: Maxim Levitsky To: kvm@vger.kernel.org Cc: Paolo Bonzini , "H. Peter Anvin" , Shuah Khan , Yang Zhong , Wei Wang , Colton Lewis , Sean Christopherson , Jim Mattson , Chenyi Qiang , Borislav Petkov , linux-kernel@vger.kernel.org, x86@kernel.org, Thomas Gleixner , Dave Hansen , Ingo Molnar , David Matlack , Peter Xu , Maxim Levitsky , linux-kselftest@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/9] KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in use Date: Thu, 3 Nov 2022 15:57:29 +0200 Message-Id: <20221103135736.42295-3-mlevitsk@redhat.com> In-Reply-To: <20221103135736.42295-1-mlevitsk@redhat.com> References: <20221103135736.42295-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748483912583074125?= X-GMAIL-MSGID: =?utf-8?q?1748483912583074125?= Make sure that KVM uses vmcb01 before freeing nested state, and warn if that is not the case. This is a minimal fix for CVE-2022-3344 making the kernel print a warning instead of a kernel panic. Cc: stable@vger.kernel.org Signed-off-by: Maxim Levitsky --- arch/x86/kvm/svm/nested.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index b258d6988f5dde..b74da40c1fc40c 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -1126,6 +1126,9 @@ void svm_free_nested(struct vcpu_svm *svm) if (!svm->nested.initialized) return; + if (WARN_ON_ONCE(svm->vmcb != svm->vmcb01.ptr)) + svm_switch_vmcb(svm, &svm->vmcb01); + svm_vcpu_free_msrpm(svm->nested.msrpm); svm->nested.msrpm = NULL;