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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 335E4C43381 for ; Mon, 18 Feb 2019 13:47:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04104217F5 for ; Mon, 18 Feb 2019 13:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497670; bh=Re74N2lJnEHeQ7FjMDuKJBSnowXiZoeJwCHRofqIKMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QoZ4y8iOMz1BjDvEQnS7zaz4DDwIskKp0Ych8OMKONV4lKzc108G6zBaf8AoxFz6W 9VJj+hPDWVqesa58Mj8NbsTMuKjxXJLBv5UucDP1XnlhrQXor9qhw4KLJ7E0HCM70M VqNXtuU54LpQk8Ow5UJJE3Lwnt/2/PATwHxmVpcM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731066AbfBRNrs (ORCPT ); Mon, 18 Feb 2019 08:47:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:54450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729344AbfBRNrp (ORCPT ); Mon, 18 Feb 2019 08:47:45 -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 273D7217F5; Mon, 18 Feb 2019 13:47:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497664; bh=Re74N2lJnEHeQ7FjMDuKJBSnowXiZoeJwCHRofqIKMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zlxHypfWyNfOKnZvduV/auFmJejSs7l/rGFSksLpACfW+XqpkQo7XA/qg46IKYDO2 3TZyTnn2y8CrQvsiaX7t6JD+BBrB6dfpYSdFS92FB2d8tNxLKt4KrUTqQUp/aPjDI/ h8fVYCzTJtXvXTROrEsSrRv71AoSVq911xsgnt2w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaoyao Li , Paolo Bonzini Subject: [PATCH 4.20 63/92] kvm: vmx: Fix entry number check for add_atomic_switch_msr() Date: Mon, 18 Feb 2019 14:43:06 +0100 Message-Id: <20190218133500.796073034@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133454.668268457@linuxfoundation.org> References: <20190218133454.668268457@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.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiaoyao Li commit 98ae70cc476e833332a2c6bb72f941a25f0de226 upstream. Commit ca83b4a7f2d068da79a0 ("x86/KVM/VMX: Add find_msr() helper function") introduces the helper function find_msr(), which returns -ENOENT when not find the msr in vmx->msr_autoload.guest/host. Correct checking contion of no more available entry in vmx->msr_autoload. Fixes: ca83b4a7f2d0 ("x86/KVM/VMX: Add find_msr() helper function") Cc: stable@vger.kernel.org Signed-off-by: Xiaoyao Li Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2779,7 +2779,8 @@ static void add_atomic_switch_msr(struct if (!entry_only) j = find_msr(&m->host, msr); - if (i == NR_AUTOLOAD_MSRS || j == NR_AUTOLOAD_MSRS) { + if ((i < 0 && m->guest.nr == NR_AUTOLOAD_MSRS) || + (j < 0 && m->host.nr == NR_AUTOLOAD_MSRS)) { printk_once(KERN_WARNING "Not enough msr switch entries. " "Can't add msr %x\n", msr); return;