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

USB: ssu100: 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: <>
Signed-off-by: 's avatarJohan Hovold <>
Signed-off-by: 's avatarGreg Kroah-Hartman <>
parent 51ef847d
......@@ -67,13 +67,6 @@ struct ssu100_port_private {
struct async_icount icount;
static void ssu100_release(struct usb_serial *serial)
struct ssu100_port_private *priv = usb_get_serial_port_data(*serial->port);
static inline int ssu100_control_msg(struct usb_device *dev,
u8 request, u16 data, u16 index)
......@@ -441,22 +434,34 @@ static int ssu100_ioctl(struct tty_struct *tty,
static int ssu100_attach(struct usb_serial *serial)
return ssu100_initdevice(serial->dev);
static int ssu100_port_probe(struct usb_serial_port *port)
struct ssu100_port_private *priv;
struct usb_serial_port *port = *serial->port;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
if (!priv)
return -ENOMEM;
usb_set_serial_port_data(port, priv);
return ssu100_initdevice(serial->dev);
return 0;
static int ssu100_port_remove(struct usb_serial_port *port)
struct ssu100_port_private *priv;
priv = usb_get_serial_port_data(port);
return 0;
static int ssu100_tiocmget(struct tty_struct *tty)
......@@ -647,7 +652,8 @@ static struct usb_serial_driver ssu100_device = {
.open = ssu100_open,
.close = ssu100_close,
.attach = ssu100_attach,
.release = ssu100_release,
.port_probe = ssu100_port_probe,
.port_remove = ssu100_port_remove,
.dtr_rts = ssu100_dtr_rts,
.process_read_urb = ssu100_process_read_urb,
.tiocmget = ssu100_tiocmget,
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