From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C6DBC43381 for ; Mon, 18 Feb 2019 13:51:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C30C20449 for ; Mon, 18 Feb 2019 13:51:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497912; bh=Q06nQlZny/w7dhojTE+2vrjAVXPACxhjrD9T1BtTf5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hMtiPD0oNwJI+JlXRHV3HtUeVKSTa6bVzPCMs8ThhSNRmV4jQw+bkVuVOBt5QzRF4 uhjmtjSyWEqJUsI8ReCWjAADz6/j2+YdopjJs5dkxkotug5DEn2IX9fAOro00C+ugx fl9mmYKKT2Cl6zNKKBBtgGpdndRU7Cx90CWwZrjo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732252AbfBRNvu (ORCPT ); Mon, 18 Feb 2019 08:51:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:59620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732129AbfBRNvr (ORCPT ); Mon, 18 Feb 2019 08:51:47 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B02AE20449; Mon, 18 Feb 2019 13:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497907; bh=Q06nQlZny/w7dhojTE+2vrjAVXPACxhjrD9T1BtTf5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r/h1+oBLJQjRDJ9/NIRNCG4vlaYfaPJcCd6AqunitLYQqrWjHeYks0ecIOULhcWIR VLA9MDh3fR42eE2W7sF0eG3rHoSIVHSxqVzJknwtB3inOC6nqe43FoE3tqxXKW0Vok TqoSCHuWisMkpFA93HAplQz0Q0x+zIZVoFhOkpgU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cfir Cohen , David Rientjes , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Sasha Levin Subject: [PATCH 4.19 48/85] kvm: sev: Fail KVM_SEV_INIT if already initialized Date: Mon, 18 Feb 2019 14:43:14 +0100 Message-Id: <20190218133504.785434564@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133459.758004711@linuxfoundation.org> References: <20190218133459.758004711@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 3f14a89d1132dcae3c8ce6721c6ef51f6e6d9b5f ] By code inspection, it was found that multiple calls to KVM_SEV_INIT could deplete asid bits and overwrite kvm_sev_info's regions_list. Multiple calls to KVM_SVM_INIT is not likely to occur with QEMU, but this should likely be fixed anyway. This code is serialized by kvm->lock. Fixes: 1654efcbc431 ("KVM: SVM: Add KVM_SEV_INIT command") Reported-by: Cfir Cohen Signed-off-by: David Rientjes Signed-off-by: Radim Krčmář Signed-off-by: Sasha Levin --- arch/x86/kvm/svm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 02ac8fa0cd6d..ee8f8d70b98a 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -6256,6 +6256,9 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) int asid, ret; ret = -EBUSY; + if (unlikely(sev->active)) + return ret; + asid = sev_asid_new(); if (asid < 0) return ret; -- 2.19.1