From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751299AbdAWONq (ORCPT ); Mon, 23 Jan 2017 09:13:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47068 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbdAWONm (ORCPT ); Mon, 23 Jan 2017 09:13:42 -0500 Subject: Re: [PATCH 03/11] KVM: PPC: Book3S HV: Move error code assignments in two functions To: SF Markus Elfring , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: Cc: LKML , kernel-janitors@vger.kernel.org From: Paolo Bonzini Message-ID: <04f75012-7453-e1b2-b004-857fde1b253e@redhat.com> Date: Mon, 23 Jan 2017 15:13:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 23 Jan 2017 14:13:18 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/01/2017 19:21, SF Markus Elfring wrote: > From: Markus Elfring > Date: Fri, 20 Jan 2017 10:30:26 +0100 > > A local variable was set to an error code in a few cases before a concrete > error situation was detected. Thus move the corresponding assignments into > if branches to indicate a software failure there. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring > --- > arch/powerpc/kvm/book3s_hv.c | 25 +++++++++++++++---------- > 1 file changed, 15 insertions(+), 10 deletions(-) NACK, current code uses consistent style. Paolo > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 8dcbe37a4dac..a93e1c4445da 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2967,15 +2967,17 @@ static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm, > > mutex_lock(&kvm->slots_lock); > > - r = -EINVAL; > - if (log->slot >= KVM_USER_MEM_SLOTS) > + if (log->slot >= KVM_USER_MEM_SLOTS) { > + r = -EINVAL; > goto out; > + } > > slots = kvm_memslots(kvm); > memslot = id_to_memslot(slots, log->slot); > - r = -ENOENT; > - if (!memslot->dirty_bitmap) > + if (!memslot->dirty_bitmap) { > + r = -ENOENT; > goto out; > + } > > n = kvm_dirty_bitmap_bytes(memslot); > memset(memslot->dirty_bitmap, 0, n); > @@ -2984,9 +2986,10 @@ static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm, > if (r) > goto out; > > - r = -EFAULT; > - if (copy_to_user(log->dirty_bitmap, memslot->dirty_bitmap, n)) > + if (copy_to_user(log->dirty_bitmap, memslot->dirty_bitmap, n)) { > + r = -EFAULT; > goto out; > + } > > r = 0; > out: > @@ -3127,9 +3130,10 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu) > memslot = gfn_to_memslot(kvm, 0); > > /* We must have some memory at 0 by now */ > - err = -EINVAL; > - if (!memslot || (memslot->flags & KVM_MEMSLOT_INVALID)) > + if (!memslot || (memslot->flags & KVM_MEMSLOT_INVALID)) { > + err = -EINVAL; > goto out_srcu; > + } > > /* Look up the VMA for the start of this memory slot */ > hva = memslot->userspace_addr; > @@ -3144,10 +3148,11 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu) > up_read(¤t->mm->mmap_sem); > > /* We can handle 4k, 64k or 16M pages in the VRMA */ > - err = -EINVAL; > if (!(psize == 0x1000 || psize == 0x10000 || > - psize == 0x1000000)) > + psize == 0x1000000)) { > + err = -EINVAL; > goto out_srcu; > + } > > senc = slb_pgsize_encoding(psize); > kvm->arch.vrma_slb_v = senc | SLB_VSID_B_1T | >