From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751669AbeBBAUo (ORCPT ); Thu, 1 Feb 2018 19:20:44 -0500 Received: from ozlabs.org ([103.22.144.67]:54137 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbeBBAUd (ORCPT ); Thu, 1 Feb 2018 19:20:33 -0500 Date: Fri, 2 Feb 2018 11:20:29 +1100 From: Stephen Rothwell To: Radim =?UTF-8?B?S3LEjW3DocWZ?= Cc: Paolo Bonzini , Christoffer Dall , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , Marc Zyngier , Eric Biggers Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree Message-ID: <20180202112029.0f4aa558@canb.auug.org.au> In-Reply-To: <20180201152244.GC31080@flask> References: <20180201125512.7bc96674@canb.auug.org.au> <20180201104707.GA21802@cbox> <20180202002227.36db3356@canb.auug.org.au> <20180201152244.GC31080@flask> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id w120KmNF019564 Hi Radim, On Thu, 1 Feb 2018 16:22:44 +0100 Radim Krčmář wrote: > > I wasn't sure if the pti top branch is final, so I pulled hyper-v topic > branch that also also contains v4.15. This and the SEV feature > conflicts should be gone now, That merge would have been a good place to add the following merge resolution fix patch I have been carrying: From: Eric Biggers Subject: KVM: x86: don't forget vcpu_put() in kvm_arch_vcpu_ioctl_set_sregs() Date: Thu, 21 Dec 2017 01:30:30 +0100 Due to a bad merge resolution between commit f29810335965 ("KVM/x86: Check input paging mode when cs.l is set") and commit b4ef9d4e8cb8 ("KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_sregs"), there is a case in kvm_arch_vcpu_ioctl_set_sregs() where vcpu_put() is not called after vcpu_get(). Fix it. Reported-by: syzbot Signed-off-by: Eric Biggers --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ea3a98196753..f4e8b5089b28 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7624,7 +7624,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, goto out; if (kvm_valid_sregs(vcpu, sregs)) - return -EINVAL; + goto out; apic_base_msr.data = sregs->apic_base; apic_base_msr.host_initiated = true; -- Cheers, Stephen Rothwell