Commit 53636555 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: iuu_phoenix: fix port-data memory leak

Fix port-data memory leak by replacing attach and release with
port_probe and port_remove.

Since commit 0998d063 (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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99a6f73c
...@@ -72,63 +72,45 @@ struct iuu_private { ...@@ -72,63 +72,45 @@ struct iuu_private {
u32 clk; u32 clk;
}; };
static int iuu_port_probe(struct usb_serial_port *port)
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)
{ {
struct iuu_private *priv; struct iuu_private *priv;
priv = kzalloc(sizeof(struct iuu_private), GFP_KERNEL); priv = kzalloc(sizeof(struct iuu_private), GFP_KERNEL);
dev_dbg(&serial->dev->dev, "%s- priv allocation success\n", __func__);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
if (iuu_alloc_buf(serial, priv)) {
priv->buf = kzalloc(256, GFP_KERNEL);
if (!priv->buf) {
kfree(priv); kfree(priv);
return -ENOMEM; return -ENOMEM;
} }
priv->writebuf = kzalloc(256, GFP_KERNEL);
if (!priv->writebuf) {
kfree(priv->buf);
kfree(priv);
return -ENOMEM;
}
priv->vcc = vcc_default; priv->vcc = vcc_default;
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
init_waitqueue_head(&priv->delta_msr_wait); 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; return 0;
} }
/* Release function */ static int iuu_port_remove(struct usb_serial_port *port)
static void iuu_release(struct usb_serial *serial)
{ {
struct usb_serial_port *port = serial->port[0];
struct iuu_private *priv = usb_get_serial_port_data(port); 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->writebuf);
kfree(priv); 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, static int iuu_tiocmset(struct tty_struct *tty,
...@@ -1225,8 +1207,8 @@ static struct usb_serial_driver iuu_device = { ...@@ -1225,8 +1207,8 @@ static struct usb_serial_driver iuu_device = {
.tiocmset = iuu_tiocmset, .tiocmset = iuu_tiocmset,
.set_termios = iuu_set_termios, .set_termios = iuu_set_termios,
.init_termios = iuu_init_termios, .init_termios = iuu_init_termios,
.attach = iuu_startup, .port_probe = iuu_port_probe,
.release = iuu_release, .port_remove = iuu_port_remove,
}; };
static struct usb_serial_driver * const serial_drivers[] = { static struct usb_serial_driver * const serial_drivers[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment