diff options
| author | Mathieu OTHACEHE | 2016-01-04 19:49:36 +0100 |
|---|---|---|
| committer | Johan Hovold | 2016-01-25 12:47:47 +0100 |
| commit | 028635d6b5b42de0e0fe5f5c92e1b99868e81a29 (patch) | |
| tree | 7e59c255d1595674a638d708cfcf7c9e953f8678 | |
| parent | USB: serial: ftdi_sio: add support for Yaesu SCU-18 cable (diff) | |
| download | kernel-qcow2-linux-028635d6b5b42de0e0fe5f5c92e1b99868e81a29.tar.gz kernel-qcow2-linux-028635d6b5b42de0e0fe5f5c92e1b99868e81a29.tar.xz kernel-qcow2-linux-028635d6b5b42de0e0fe5f5c92e1b99868e81a29.zip | |
USB: mxu11x0: fix memory leak on usb_serial private data
On nominal execution, private data allocated on port_probe and attach
are never freed. Add port_remove and release callbacks to free them
respectively.
Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
| -rw-r--r-- | drivers/usb/serial/mxu11x0.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/usb/serial/mxu11x0.c b/drivers/usb/serial/mxu11x0.c index e3c3f57c2d82..619607323bfd 100644 --- a/drivers/usb/serial/mxu11x0.c +++ b/drivers/usb/serial/mxu11x0.c @@ -368,6 +368,16 @@ static int mxu1_port_probe(struct usb_serial_port *port) return 0; } +static int mxu1_port_remove(struct usb_serial_port *port) +{ + struct mxu1_port *mxport; + + mxport = usb_get_serial_port_data(port); + kfree(mxport); + + return 0; +} + static int mxu1_startup(struct usb_serial *serial) { struct mxu1_device *mxdev; @@ -427,6 +437,14 @@ err_free_mxdev: return err; } +static void mxu1_release(struct usb_serial *serial) +{ + struct mxu1_device *mxdev; + + mxdev = usb_get_serial_data(serial); + kfree(mxdev); +} + static int mxu1_write_byte(struct usb_serial_port *port, u32 addr, u8 mask, u8 byte) { @@ -957,7 +975,9 @@ static struct usb_serial_driver mxu11x0_device = { .id_table = mxu1_idtable, .num_ports = 1, .port_probe = mxu1_port_probe, + .port_remove = mxu1_port_remove, .attach = mxu1_startup, + .release = mxu1_release, .open = mxu1_open, .close = mxu1_close, .ioctl = mxu1_ioctl, |