| Message ID | 328d3b62-2113-e51a-5d66-79d515de3179@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <elfring@users.sourceforge.net> Acked-by: Clemens Ladisch <clemens@ladisch.de> > --- > 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); >
On Wed, 23 Aug 2017 12:25:50 +0200, SF Markus Elfring wrote: > > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Wed, 23 Aug 2017 12:20:07 +0200 > > 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 <elfring@users.sourceforge.net> Applied, thanks. Takashi
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);