From patchwork Fri Feb 2 00:20:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10196157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 23A1A601A0 for ; Fri, 2 Feb 2018 00:20:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 034CD2893D for ; Fri, 2 Feb 2018 00:20:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBC0928C57; Fri, 2 Feb 2018 00:20:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 757E92893D for ; Fri, 2 Feb 2018 00:20:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751585AbeBBAUf (ORCPT ); Thu, 1 Feb 2018 19:20:35 -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 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3zXd1B1X6Rz9sBZ; Fri, 2 Feb 2018 11:20:30 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1517530830; bh=Wm2yxw15sc5k9pLYIm2QgUMoyQxzBUmuIH9crD9MDbI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=gRnjfzwfO27/74buasbt2v3bC9swTLzJjp3VuXC1xVs3uvFESCeHURMiweYEkuML6 B9wePD9Ot0xH5ZmU0QJ4ff6g34eb90BY+d2eFDOXZsSDHeuWNqY4o4dEk7oB6tf2qr YO+yj+YRnqwTJZyL64AHVwmHEYBaZtcD4ozw9n2PK0EdwR+WocQQSjv1v0bUNrZF+S nRYaAlBqP3aFQePgQTxJvbO6Ug4C3PLOyAhQpia7oXQGc4mpAdWQjEuur62kAVvBXD qTMADUXpB+AJxRL5Xbo3VtEF0gq+SwPmZFGjhDlh7eEBkXHcCKACRFu8XbM+iRUcSe LFI3Zny3w4XDg== 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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;