Skip to content

Commit

Permalink
USB: iuu_phoenix: fix port-data memory leak
Browse files Browse the repository at this point in the history
Fix port-data memory leak by replacing attach and release with
port_probe and port_remove.

Since commit 0998d06 (device-core: Ensure drvdata = NULL when no
driver is bound) the port private data is no longer freed at release as
it is no longer accessible.

Compile-only tested.

Cc: <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Oct 17, 2012
1 parent 99a6f73 commit 5363655
Showing 1 changed file with 22 additions and 40 deletions.
62 changes: 22 additions & 40 deletions drivers/usb/serial/iuu_phoenix.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,63 +72,45 @@ struct iuu_private {
u32 clk;
};


static void iuu_free_buf(struct iuu_private *priv)
{
kfree(priv->buf);
kfree(priv->writebuf);
}

static int iuu_alloc_buf(struct usb_serial *serial, struct iuu_private *priv)
{
priv->buf = kzalloc(256, GFP_KERNEL);
priv->writebuf = kzalloc(256, GFP_KERNEL);
if (!priv->buf || !priv->writebuf) {
iuu_free_buf(priv);
dev_dbg(&serial->dev->dev, "%s problem allocation buffer\n", __func__);
return -ENOMEM;
}
dev_dbg(&serial->dev->dev, "%s - Privates buffers allocation success\n", __func__);
return 0;
}

static int iuu_startup(struct usb_serial *serial)
static int iuu_port_probe(struct usb_serial_port *port)
{
struct iuu_private *priv;

priv = kzalloc(sizeof(struct iuu_private), GFP_KERNEL);
dev_dbg(&serial->dev->dev, "%s- priv allocation success\n", __func__);
if (!priv)
return -ENOMEM;
if (iuu_alloc_buf(serial, priv)) {

priv->buf = kzalloc(256, GFP_KERNEL);
if (!priv->buf) {
kfree(priv);
return -ENOMEM;
}

priv->writebuf = kzalloc(256, GFP_KERNEL);
if (!priv->writebuf) {
kfree(priv->buf);
kfree(priv);
return -ENOMEM;
}

priv->vcc = vcc_default;
spin_lock_init(&priv->lock);
init_waitqueue_head(&priv->delta_msr_wait);
usb_set_serial_port_data(serial->port[0], priv);

usb_set_serial_port_data(port, priv);

return 0;
}

/* Release function */
static void iuu_release(struct usb_serial *serial)
static int iuu_port_remove(struct usb_serial_port *port)
{
struct usb_serial_port *port = serial->port[0];
struct iuu_private *priv = usb_get_serial_port_data(port);
if (!port)
return;

if (priv) {
iuu_free_buf(priv);
dev_dbg(&port->dev, "%s - I will free all\n", __func__);
usb_set_serial_port_data(port, NULL);

dev_dbg(&port->dev, "%s - priv is not anymore in port structure\n", __func__);
kfree(priv);
kfree(priv->writebuf);
kfree(priv->buf);
kfree(priv);

dev_dbg(&port->dev, "%s priv is now kfree\n", __func__);
}
return 0;
}

static int iuu_tiocmset(struct tty_struct *tty,
Expand Down Expand Up @@ -1225,8 +1207,8 @@ static struct usb_serial_driver iuu_device = {
.tiocmset = iuu_tiocmset,
.set_termios = iuu_set_termios,
.init_termios = iuu_init_termios,
.attach = iuu_startup,
.release = iuu_release,
.port_probe = iuu_port_probe,
.port_remove = iuu_port_remove,
};

static struct usb_serial_driver * const serial_drivers[] = {
Expand Down

0 comments on commit 5363655

Please sign in to comment.