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.4 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 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 5978CC43387 for ; Sat, 5 Jan 2019 15:30:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2355E206B6 for ; Sat, 5 Jan 2019 15:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546702228; bh=EBJjtG+Nanju/OgM2tWNmLBurIXM/crHobB88ktqwiU=; h=Subject:To:Cc:From:Date:List-ID:From; b=W8nd/uDzCQApzMkrGmz2oOcp312G2Epm06Hk94Mw4Syzms/AHCh2xTdv+xkpf+wbz nf5xGPNq5vHuwUtJdpIsvD+7jWI6RmncdyMmn2rZad8uxpZoSKrZ0nWRO6s6D+u779 WYTVlh0OK8BKaM7ah/hedtmT7zadLecfv9A//DWc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726276AbfAEPa1 (ORCPT ); Sat, 5 Jan 2019 10:30:27 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49061 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726236AbfAEPa1 (ORCPT ); Sat, 5 Jan 2019 10:30:27 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 9B8CA22070; Sat, 5 Jan 2019 10:30:26 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sat, 05 Jan 2019 10:30:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=cjbe+d DqsItVbgDr5ExmsqyvtcZoOBOCD5A9Uf2QW1o=; b=RUXsj9jCg3vbcOizK8qWue 7MVelAXNbceY1inDpZ3zU6QE+vhZa6V2ZoepSkmM6wxl95Gc99IZzRpSovQREHyR 2kggnLPZcwZpQIYXc5Es1UB4dpLsfbP3CqlWBHb9sfo9RpV2FJ7Kf9mOVds2xS66 UKANqI8EfbczOPL60wHgOClCymSrT3TmooAExLjdCiFs+k3KBqw+ear5ZbZGST+O l4jnTSHvuhwcS+mhmi14/2A2AJlhBq7YkOUst7kKA2nX1nvuQ4yOl8LhtRrIq3DE x0ixoCYIsUc/iSxuXL8sUCqxWxyZZR6oO7n7nePw9P1y6Gm6SWsh02+DE+NBLHyw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrvdefgdejleculddtuddrgedtkedrtddtmd cutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppedukeekrdekledrudefhedrkeejnecurfgrrhgrmhepmhgrihhlfhhroh hmpehgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (unknown [188.89.135.87]) by mail.messagingengine.com (Postfix) with ESMTPA id CE58EE40A1; Sat, 5 Jan 2019 10:30:25 -0500 (EST) Subject: FAILED: patch "[PATCH] KVM: nVMX: Free the VMREAD/VMWRITE bitmaps if" failed to apply to 4.9-stable tree To: sean.j.christopherson@intel.com, pbonzini@redhat.com Cc: From: Date: Sat, 05 Jan 2019 16:30:24 +0100 Message-ID: <154670222496112@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1b3ab5ad1b8ad99bae76ec583809c5f5a31c707c Mon Sep 17 00:00:00 2001 From: Sean Christopherson Date: Mon, 3 Dec 2018 13:52:51 -0800 Subject: [PATCH] KVM: nVMX: Free the VMREAD/VMWRITE bitmaps if alloc_kvm_area() fails Fixes: 34a1cd60d17f ("kvm: x86: vmx: move some vmx setting from vmx_init() to hardware_setup()") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson Signed-off-by: Paolo Bonzini diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index c379d0bfdcba..3ec47b7a94d6 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8037,13 +8037,16 @@ static __init int hardware_setup(void) kvm_mce_cap_supported |= MCG_LMCE_P; - return alloc_kvm_area(); + r = alloc_kvm_area(); + if (r) + goto out; + return 0; out: for (i = 0; i < VMX_BITMAP_NR; i++) free_page((unsigned long)vmx_bitmap[i]); - return r; + return r; } static __exit void hardware_unsetup(void)