diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 10:29:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-25 18:36:59 +0200 |
| commit | acbf0e5263de563e25f7c104868e4490b9e72b13 (patch) | |
| tree | eea29d377e4e0985f02000d7dff95c7c187c820e /drivers/usb/serial/opticon.c | |
| parent | USB: opticon: fix DMA from stack (diff) | |
| download | linux-acbf0e5263de563e25f7c104868e4490b9e72b13.tar.xz linux-acbf0e5263de563e25f7c104868e4490b9e72b13.zip | |
USB: opticon: fix memory leak in error path
Fix memory leak in write error path.
Cc: <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/opticon.c')
| -rw-r--r-- | drivers/usb/serial/opticon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 459c28889fe4..6aba731d4864 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c @@ -286,7 +286,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port, if (!dr) { dev_err(&port->dev, "out of memory\n"); count = -ENOMEM; - goto error; + goto error_no_dr; } dr->bRequestType = USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT; @@ -316,6 +316,8 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port, return count; error: + kfree(dr); +error_no_dr: usb_free_urb(urb); error_no_urb: kfree(buffer); |