diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 10:29:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 09:51:35 -0700 |
| commit | 8766126e36d14abae5f1e13df3a548ef24c605b8 (patch) | |
| tree | b4cf9df882a3063be77c8f52dd144842c10817dd | |
| parent | 84c1f11aab59b6e56dd6cf26967127057d4665c9 (diff) | |
| download | kernel_samsung_crespo-8766126e36d14abae5f1e13df3a548ef24c605b8.zip kernel_samsung_crespo-8766126e36d14abae5f1e13df3a548ef24c605b8.tar.gz kernel_samsung_crespo-8766126e36d14abae5f1e13df3a548ef24c605b8.tar.bz2 | |
USB: opticon: fix memory leak in error path
commit acbf0e5263de563e25f7c104868e4490b9e72b13 upstream.
Fix memory leak in write error path.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 0159090..5d274b3 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c @@ -297,7 +297,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; @@ -327,6 +327,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); |