]> git.karo-electronics.de Git - linux-beck.git/commitdiff
line6: fix memory leaks in line6_init_midi()
authorJesper Juhl <jj@chaosbits.net>
Mon, 24 Oct 2011 21:41:37 +0000 (23:41 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 00:14:11 +0000 (16:14 -0800)
If the first call to line6_midibuf_init() fails we'll leak a little
bit of memory. If the second call fails we'll leak a bit more. This
happens when we return from the function and the local variable
'line6midi' goes out of scope.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/line6/midi.c

index e554a2da643a6dcc07582a66a8e0de99ccc0a90b..86c50cf9b2a78d1952d36486c7fe33514c227bac 100644 (file)
@@ -391,12 +391,17 @@ int line6_init_midi(struct usb_line6 *line6)
                return -ENOMEM;
 
        err = line6_midibuf_init(&line6midi->midibuf_in, MIDI_BUFFER_SIZE, 0);
-       if (err < 0)
+       if (err < 0) {
+               kfree(line6midi);
                return err;
+       }
 
        err = line6_midibuf_init(&line6midi->midibuf_out, MIDI_BUFFER_SIZE, 1);
-       if (err < 0)
+       if (err < 0) {
+               kfree(line6midi->midibuf_in.buf);
+               kfree(line6midi);
                return err;
+       }
 
        line6midi->line6 = line6;
        line6midi->midi_mask_transmit = 1;