usbserial: Fixes leak in serial_open() error path.
Subsystems (2)
PATCH 2/2 usbserial: Fixes leak in serial_open() error path.
If serial_open() fails at the port assignment or mutex_lock_interruptible()
is interrupted, the 'serial' object will never be freed.
We should call kref_put() when those errors happens.
Signed-off-by Luiz Fernando N. Capitulino <[email protected]>
---
drivers/usb/serial/usb-serial.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
56bff699ffd5616ed10c5945faa8721520e7a902
drivers/usb/serial/usb-serial.c +11 -6
@@ -189,11 +189,15 @@ static int serial_open (struct tty_struc portNumber = tty->index - serial->minor; port = serial->port[portNumber]; -if (!port) -return -ENODEV ; +if (!port) { + retval = -ENODEV ; + goto bailout_kref_put; + } -if (mutex_lock_interruptible (&port->mutex)) -return -ERESTARTSYS ; +if (mutex_lock_interruptible (&port->mutex)) { + retval = -ERESTARTSYS ; + goto bailout_kref_put; + } ++port->open_count;
@@ -209,7 +213,7 @@ static int serial_open (struct tty_struc* safe because we are called with BKL held */ if (!try_module_get (serial->type->driver.owner)) { retval = -ENODEV ; - goto bailout_kref_put; + goto bailout_mutex_unlock; }/* only call the device specific open if this
@@ -224,9 +228,10 @@ static int serial_open (struct tty_struc bailout_module_put:module_put (serial->type->driver.owner); -bailout_kref_put: +bailout_mutex_unlock: port->open_count =0 ;mutex_unlock (&port->mutex); +bailout_kref_put:kref_put (&serial->kref, destroy_serial);return retval; }
Signature · 6 lines
1.3.1.ge5de -- Luiz Fernando N. Capitulino