From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752937AbcHQSMg (ORCPT ); Wed, 17 Aug 2016 14:12:36 -0400 Received: from mout.web.de ([212.227.15.4]:63665 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752406AbcHQSMd (ORCPT ); Wed, 17 Aug 2016 14:12:33 -0400 Subject: [PATCH 3/4] KVM-S390: Less function calls in kvm_s390_import_bp_data() after error detection To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, =?UTF-8?Q?Christian_Borntr=c3=a4ger?= , Cornelia Huck , David Hildenbrand , Heiko Carstens , Martin Schwidefsky , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: <82b84c9c-38a4-4d17-910f-312668dbae01@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <47f88a11-b949-28ed-5589-925888a37574@users.sourceforge.net> Date: Wed, 17 Aug 2016 20:10:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <82b84c9c-38a4-4d17-910f-312668dbae01@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:SLvGFQaxIDJQv+e20PTZ5qceTFKagiJ3KcPzEtYmmv3qOHxC20M ND0WYebRYNb22BIPGfQZeOddbXWT165/EeiNyuLXoS9BV8mM1zxbmmAVQPPKgKjQsv67MpG 1a7qNKBicJA3KnFEfIXewu9tJIzq7hKD0OE/xNMu6ug18TS4gUjoLR80aopPL2tX7zKVHxC 2Ejf69HvsAEpVso8slN2A== X-UI-Out-Filterresults: notjunk:1;V01:K0:lEkvzoilNa8=:ZaOw1z0G2ogamRzGUShMv1 Lnj2fEz2NCFovMy4iMZTor+wchoxKUbR8gFnIHtC0KHypBOOPbRkC1UjAkSU0pH3W8mZGxUGV 0ZhCAtE70xW15RHbzWQvNHiHzNvHq2n5moONwq5MVqLuBvdTgRf86MTF5lwbMYsorpXSrnNfw ozKIJKwXdl6I2ywx7NGV9mwgdVcEEu/SS3nwoOpbVHtl31owIAKTUmfN5/7ttWpQ3WBu/C/JD d+hWoS3FvYLkqDGuksum35CEKMqmohezM8E3TQNFYanNqTfrpt6B5rTZseK9T7Dsx7SNNeMTj MrWrz23fNnx2erTu3ic1UEZzydVtjK9d724Zik3Qf7ZcxLz2noFREFdABGvOtLrIngfTUMGoY lYF/x0IfywATKFMIR9nRJFmQCqPEzECO8QP0cTGlxiCS71uc0vUS0nIoo4X/sNNY+GEfZ6laZ FgSwSBwAU7VWyibRmBg4Z7jwdtiXE5YR8evgjHyuLvWKbm0JO4uppktZgjrHrNi2CvW7sbfaV iDAHD4hYQ1WvTaRm05eTiFVEqNEdQhKCSfB/URdBgLMfdQbwobqF2QRSlorOqfrhMp0EFyfN/ YYGxoiCU639MrbmWMkw5YIoGRUvYuCvj+bWh0fkKM0HGuYxDtS6bfcpMCtm9MwG3fz+E4p2wj iDc9tB+WM1KjzeMbkH11i+r9M/N7FTSUgb6ojcn/T/cttPzka7uyk+qFU4xWKRFlV4qdivFXi 4Y+ZrEK9UPHS85u95GlH/hECHp1+aKoV6CcfuHhbkd9eCQuwzGqM1HlQf2+SsbHwx0RBJj6ru rR24S37 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 17 Aug 2016 19:25:50 +0200 The kfree() function was called in a few cases by the kvm_s390_import_bp_data() function during error handling even if a passed variable contained a null pointer. Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- arch/s390/kvm/guestdbg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/guestdbg.c index 8f886ee..f2514af 100644 --- a/arch/s390/kvm/guestdbg.c +++ b/arch/s390/kvm/guestdbg.c @@ -239,7 +239,7 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, wp_info = kmalloc(size, GFP_KERNEL); if (!wp_info) { ret = -ENOMEM; - goto error; + goto free_bp_data; } } size = nr_bp * sizeof(*bp_info); @@ -247,7 +247,7 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, bp_info = kmalloc(size, GFP_KERNEL); if (!bp_info) { ret = -ENOMEM; - goto error; + goto free_wp_info; } } @@ -257,7 +257,7 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, ret = __import_wp_info(vcpu, &bp_data[i], &wp_info[nr_wp]); if (ret) - goto error; + goto free_bp_info; nr_wp++; break; case KVM_HW_BP: @@ -273,10 +273,12 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, vcpu->arch.guestdbg.nr_hw_wp = nr_wp; vcpu->arch.guestdbg.hw_wp_info = wp_info; return 0; -error: - kfree(bp_data); - kfree(wp_info); +free_bp_info: kfree(bp_info); +free_wp_info: + kfree(wp_info); +free_bp_data: + kfree(bp_data); return ret; } -- 2.9.3