From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751031AbdAUQD6 (ORCPT ); Sat, 21 Jan 2017 11:03:58 -0500 Received: from mout.web.de ([212.227.17.11]:54799 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbdAUQDy (ORCPT ); Sat, 21 Jan 2017 11:03:54 -0500 To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, =?UTF-8?Q?Christian_Borntr=c3=a4ger?= , Cornelia Huck , Heiko Carstens , Martin Schwidefsky , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= From: SF Markus Elfring Subject: [PATCH] KVM: s390: Move two error code assignments in kvm_vm_ioctl_get_dirty_log() Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <70f41e59-d8a4-de42-6064-80ecf6acc065@users.sourceforge.net> Date: Sat, 21 Jan 2017 17:03:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:gvCMNZVv23d9o1zSJXA4d98pfszLTOBx1nbSt0OkRj1RdYHu5ro gQvA8lH7lPmbMjaz82+p/HKyENqtpJ/a4YTWAzdSDAwEEU9MXT1NYvACcgn0QI1PgvIus5E 38SWRJHkM3M8irR9mV6pJ3GSXIaosr4zI9DpQ9trUQl/8HeKQDf7ETkCBQ4gwj0jy8tH3FV h66cPFacHs2EpMJGkZevw== X-UI-Out-Filterresults: notjunk:1;V01:K0:0cGXbKIDefw=:nip3AC1R++rM33oObuaNB9 VGMwkpHZl5B284G/4snTtU6oNGRy3XDk/4+oxFagYxSYhcf2lBYYlvnBty1UDfGC31vzVQDpD z1gwYyaYM3bRyPVGtTyWSy0MVJROMserp0Nim1EY9ypAc1m9o6WIlCuyR96KzSElDVQPO3EzU UXhp6kjZkyGi+F7ewFIU5vbwuUoTRRDT9e2L5Rv+NFmlztialTenOzv/ps6kNAg+4D4JQYRms 7z3QI5byIfAxYGyAwWtlOtQHYGGzkFwsKaTcFvPuWbNoMk+mBtn7oZl1jNew+PtWH1wP6cwXN HtD04kw1M6inlGgN497U71DTBr+WFj5oNStgN3qG+hN/ywFpMJ7nReMHevgybuADMBI8bDlZ6 sCv9P/hxAK4YeM6V2bn99eifaibJkpEgVoJ3LTmKQhNvf3uOf3Sf0FTTjbkXbNg+p4l+b61HU kNsRfhwwupZCN3iO5vdttc4f8NwylWrjNUapIMO/JUYhbo13qvczStqPn+lCvwC8JmKzjYMBQ CqUTNsXJiYAnv16E35DzOWSgaKACka17eJmAfAt1uCl23pePvi6ClItbTvQ6wWQwV5khdPOye 0TppHrKpEruaSNXEtqgPGBQDwGBQw9s3dSHJzbzQQBvkvyf8PzEPZ2TTFRdXakhgYfa0p+I0p 83/cwtLz+/fwL8GuPq0R6oy9n1MgNQzrgOHC/HkTwo/oVxbyfMrDmRcvq/uaKOwPlBcVR+EQ1 L27xrUvcO4/gTzUxTLhAyPUYqMsrlUq05LKaLQGQ1uF4Pi6zzONjOZ6ZQTPpydPtgx1XswbQW j7zp38l Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 21 Jan 2017 16:52:23 +0100 A local variable was set to an error code in two 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/s390/kvm/kvm-s390.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 4f74511015b8..bc875d08b838 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -443,16 +443,17 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, int is_dirty = 0; 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; + } kvm_s390_sync_dirty_log(kvm, memslot); r = kvm_get_dirty_log(kvm, log, &is_dirty); -- 2.11.0