Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753879AbdHWKzb (ORCPT ); Wed, 23 Aug 2017 06:55:31 -0400 Received: from webclient5.webclient5.de ([136.243.32.179]:52748 "EHLO webclient5.webclient5.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753687AbdHWKz3 (ORCPT ); Wed, 23 Aug 2017 06:55:29 -0400 X-Greylist: delayed 365 seconds by postgrey-1.27 at vger.kernel.org; Wed, 23 Aug 2017 06:55:29 EDT Subject: Re: [alsa-devel] [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create() To: Takashi Iwai Cc: SF Markus Elfring , alsa-devel@alsa-project.org, Jaroslav Kysela , kernel-janitors@vger.kernel.org, LKML References: <328d3b62-2113-e51a-5d66-79d515de3179@users.sourceforge.net> From: Clemens Ladisch Message-ID: Date: Wed, 23 Aug 2017 12:49:16 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <328d3b62-2113-e51a-5d66-79d515de3179@users.sourceforge.net> Content-Type: text/plain; charset=us-ascii 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 Content-Length: 1654 Lines: 65 SF Markus Elfring wrote: > Add jump targets 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 Acked-by: Clemens Ladisch > --- > sound/usb/midi.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/sound/usb/midi.c b/sound/usb/midi.c > index a35f41467237..bd9d02268724 100644 > --- a/sound/usb/midi.c > +++ b/sound/usb/midi.c > @@ -2435,10 +2435,8 @@ int __snd_usbmidi_create(struct snd_card *card, > err = -ENXIO; > break; > } > - if (err < 0) { > - kfree(umidi); > - return err; > - } > + if (err < 0) > + goto free_midi; > > /* create rawmidi device */ > out_ports = 0; > @@ -2448,23 +2446,25 @@ int __snd_usbmidi_create(struct snd_card *card, > in_ports += hweight16(endpoints[i].in_cables); > } > err = snd_usbmidi_create_rawmidi(umidi, out_ports, in_ports); > - if (err < 0) { > - kfree(umidi); > - return err; > - } > + if (err < 0) > + goto free_midi; > > /* create endpoint/port structures */ > if (quirk && quirk->type == QUIRK_MIDI_MIDIMAN) > err = snd_usbmidi_create_endpoints_midiman(umidi, &endpoints[0]); > else > err = snd_usbmidi_create_endpoints(umidi, endpoints); > - if (err < 0) { > - return err; > - } > + if (err < 0) > + goto exit; > > usb_autopm_get_interface_no_resume(umidi->iface); > > list_add_tail(&umidi->list, midi_list); > return 0; > + > +free_midi: > + kfree(umidi); > +exit: > + return err; > } > EXPORT_SYMBOL(__snd_usbmidi_create); >