From patchwork Thu Nov 3 14:13:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 14908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp560667wru; Thu, 3 Nov 2022 07:16:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ObueKk/yvIuH3kKjCghvapifTC1dmiFDhIPeCEhya8Tw7ShjeGS7QGBbt3FqFHpWQHkll X-Received: by 2002:a17:90a:c705:b0:213:1455:1326 with SMTP id o5-20020a17090ac70500b0021314551326mr31567214pjt.244.1667484999535; Thu, 03 Nov 2022 07:16:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667484999; cv=none; d=google.com; s=arc-20160816; b=dDIKx3hoUZC3Lg+qWF3lu0Zj0/c7OTaUnK8Tm88xEVpHpr0zcOj9KSXk7/gGB1iFqi 0oO9FcwfWJhQ7NOqKYG93Kjk/+89ayGk/8fgroDlzVaTRWJOP14IpiWAFqunelvdILrU U3xoQfl6ByvwDfZGWQvpRebQmMrdNl8PvLoGUnC1OqlAUS0NOGO+PQVfa+yE4J3crowU Sk/KJf3lDH5/4sNNeaF9Y9/C9gzl5ORjTuOfhiYgDpugfkX5KhUgvRY5+5M8wUD8rzN3 pJuY3wVLAte/iXLDR+Yr7CRL4lYMbriXX8wDkcv6tKX7QSIYc70pgRgtX8wP73crXEN7 iGmA== 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=lNIiQPCCgCBmDl4iL7kB3yl2YiEDTqMo6GEI1vRK9e3VT911HGDQgtJYMk7kQUmRe8 o3t/FH/lytXuiOkD0vISoRWdfkl+kDFmNr77y6jLTcvQ2SjE6+U3fgj5jnWNw7S0Hbkl XH/zZbXx6JoTWNIRESiSOe4momLjAu6EMDpT1BBx1AS4ikgA2ZnITsTJYX19LwODlzHO EHnDGdNg9trCT+UmkENmyYoWWNhDuw8b7qC/ef/UnZphNccqbyIMnusWBxwx6XW9EsOQ XNx1VKqRNT9yrIHbzh3YazHlB68ULPd/fJBojY0/nLljgboEyAgXRMxt3AuMJ//lm9sU SLsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LsoYO+v4; 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 v20-20020a63d554000000b00470275be1b8si1107339pgi.622.2022.11.03.07.16.22; Thu, 03 Nov 2022 07:16:39 -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=LsoYO+v4; 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 S231654AbiKCOPV (ORCPT + 99 others); Thu, 3 Nov 2022 10:15:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbiKCOPL (ORCPT ); Thu, 3 Nov 2022 10:15:11 -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 8A37C101FA for ; Thu, 3 Nov 2022 07:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667484849; 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=LsoYO+v4QEYixIPKPf6HTdXHDwZWIfBSxLNCYnzG38vsZ5BZkDCd7fJPQRkjLRQJpsfRne 8Pn0QXmXHvApUDyngWmHlpQS60zihkc5sXyjd/PKjo7wi8oLFB2fwSgH1sL01JJrfcfzGH 6f6kI9y45iuDUklcsiWQBq4fGaYeAXQ= 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-435-S-ZNYUDBODiUjCzhqFo44A-1; Thu, 03 Nov 2022 10:14:05 -0400 X-MC-Unique: S-ZNYUDBODiUjCzhqFo44A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EAE2029AA3BB; Thu, 3 Nov 2022 14:14:03 +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 2EA8040C6EC3; Thu, 3 Nov 2022 14:14:00 +0000 (UTC) From: Maxim Levitsky To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Gleixner , linux-kernel@vger.kernel.org, Chenyi Qiang , Yang Zhong , x86@kernel.org, Shuah Khan , Dave Hansen , "H. Peter Anvin" , Maxim Levitsky , Colton Lewis , Borislav Petkov , Peter Xu , Sean Christopherson , Jim Mattson , linux-kselftest@vger.kernel.org, Ingo Molnar , Wei Wang , David Matlack , stable@vger.kernel.org Subject: [PATCH v2 2/9] KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in use Date: Thu, 3 Nov 2022 16:13:44 +0200 Message-Id: <20221103141351.50662-3-mlevitsk@redhat.com> In-Reply-To: <20221103141351.50662-1-mlevitsk@redhat.com> References: <20221103141351.50662-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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?1748484750527088886?= X-GMAIL-MSGID: =?utf-8?q?1748484750527088886?= 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 Reviewed-by: Liam Merwick --- 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;