public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] KVM: s390: Move two error code assignments in kvm_vm_ioctl_get_dirty_log()
@ 2017-01-21 16:03 SF Markus Elfring
  2017-01-23  8:22 ` Christian Borntraeger
  0 siblings, 1 reply; 13+ messages in thread
From: SF Markus Elfring @ 2017-01-21 16:03 UTC (permalink / raw)
  To: kvm, linux-s390, Christian Bornträger, Cornelia Huck,
	Heiko Carstens, Martin Schwidefsky, Paolo Bonzini,
	Radim Krčmář
  Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2017-01-24 12:47 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-21 16:03 [PATCH] KVM: s390: Move two error code assignments in kvm_vm_ioctl_get_dirty_log() SF Markus Elfring
2017-01-23  8:22 ` Christian Borntraeger
2017-01-23  9:19   ` Paolo Bonzini
2017-01-23 11:08   ` SF Markus Elfring
2017-01-23 11:58     ` Christian Borntraeger
2017-01-24 12:10       ` SF Markus Elfring
2017-01-24 12:18         ` Paolo Bonzini
2017-01-24 12:31           ` SF Markus Elfring
2017-01-24 12:38             ` Christian Borntraeger
2017-01-24 12:47               ` SF Markus Elfring
2017-01-23 12:21     ` Dan Carpenter
2017-01-23 13:21       ` SF Markus Elfring
2017-01-23 13:37         ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox