Skip to content

Commit

Permalink
USB: mxu11x0: fix memory leak on usb_serial private data
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mathieu OTHACEHE authored and Johan Hovold committed Jan 25, 2016
1 parent e03cdf2 commit 028635d
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions drivers/usb/serial/mxu11x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -427,6 +437,14 @@ static int mxu1_startup(struct usb_serial *serial)
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)
{
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 028635d

Please sign in to comment.