From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755132AbdLOJDO (ORCPT ); Fri, 15 Dec 2017 04:03:14 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:42513 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754661AbdLOJDH (ORCPT ); Fri, 15 Dec 2017 04:03:07 -0500 X-Google-Smtp-Source: ACJfBotTnpxRZKtdVVTSdRGlFSNR8p1kHmcfyy6AwVrfWL/VQQJJ9PzF/lcsEMQF1bVZd+28MfouwQ== Subject: Re: [PATCH] kvm_main: Use common error handling code in kvm_dev_ioctl_create_vm() To: SF Markus Elfring , kvm@vger.kernel.org, =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= Cc: LKML , kernel-janitors@vger.kernel.org References: <46892736-f9a1-cd30-0968-80c0cf41c3ee@users.sourceforge.net> From: Paolo Bonzini Message-ID: Date: Fri, 15 Dec 2017 10:03:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <46892736-f9a1-cd30-0968-80c0cf41c3ee@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21/11/2017 13:46, SF Markus Elfring wrote: > From: Markus Elfring > Date: Tue, 21 Nov 2017 13:40:17 +0100 > > Add a jump target so that a bit of exception handling can be better reused > at the end of this function. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring > --- > virt/kvm/kvm_main.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 39e4db469f2e..c84341c79955 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -3155,21 +3155,18 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) > return PTR_ERR(kvm); > #ifdef CONFIG_KVM_MMIO > r = kvm_coalesced_mmio_init(kvm); > - if (r < 0) { > - kvm_put_kvm(kvm); > - return r; > - } > + if (r < 0) > + goto put_kvm; > #endif > r = get_unused_fd_flags(O_CLOEXEC); > - if (r < 0) { > - kvm_put_kvm(kvm); > - return r; > - } > + if (r < 0) > + goto put_kvm; > + > file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); > if (IS_ERR(file)) { > put_unused_fd(r); > - kvm_put_kvm(kvm); > - return PTR_ERR(file); > + r = PTR_ERR(file); > + goto put_kvm; > } > > /* > @@ -3187,6 +3184,10 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) > > fd_install(r, file); > return r; > + > +put_kvm: > + kvm_put_kvm(kvm); > + return r; > } > > static long kvm_dev_ioctl(struct file *filp, > Queued, thanks. Paolo