Commit 289b076f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: oti6858: 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 53636555

drivers/usb/serial/oti6858.c

+28 −40
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty); 
static int oti6858_tiocmget(struct tty_struct *tty);

static int oti6858_tiocmset(struct tty_struct *tty,

				unsigned int set, unsigned int clear);

static int oti6858_startup(struct usb_serial *serial);

static void oti6858_release(struct usb_serial *serial);

static int oti6858_port_probe(struct usb_serial_port *port);

static int oti6858_port_remove(struct usb_serial_port *port);



/* device info */

static struct usb_serial_driver oti6858_device = {
@@ -161,8 +161,8 @@ static struct usb_serial_driver oti6858_device = { 
	.write_bulk_callback =	oti6858_write_bulk_callback,

	.write_room =		oti6858_write_room,

	.chars_in_buffer =	oti6858_chars_in_buffer,

	.attach =		oti6858_startup,

	.release =		oti6858_release,

	.port_probe =		oti6858_port_probe,

	.port_remove =		oti6858_port_remove,

};



static struct usb_serial_driver * const serial_drivers[] = {
@@ -331,36 +331,33 @@ static void send_data(struct work_struct *work) 
	usb_serial_port_softint(port);

}



static int oti6858_startup(struct usb_serial *serial)

static int oti6858_port_probe(struct usb_serial_port *port)

{

	struct usb_serial_port *port = serial->port[0];

	struct oti6858_private *priv;

	int i;



	for (i = 0; i < serial->num_ports; ++i) {

		priv = kzalloc(sizeof(struct oti6858_private), GFP_KERNEL);

	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

			break;

		return -ENOMEM;



	spin_lock_init(&priv->lock);

	init_waitqueue_head(&priv->intr_wait);

/*		INIT_WORK(&priv->setup_work, setup_line, serial->port[i]); */

/*		INIT_WORK(&priv->write_work, send_data, serial->port[i]); */

	priv->port = port;

	INIT_DELAYED_WORK(&priv->delayed_setup_work, setup_line);

	INIT_DELAYED_WORK(&priv->delayed_write_work, send_data);



		usb_set_serial_port_data(serial->port[i], priv);

	}

	if (i == serial->num_ports)

	usb_set_serial_port_data(port, priv);



	return 0;

}



	for (--i; i >= 0; --i) {

		priv = usb_get_serial_port_data(serial->port[i]);

static int oti6858_port_remove(struct usb_serial_port *port)

{

	struct oti6858_private *priv;



	priv = usb_get_serial_port_data(port);

	kfree(priv);

		usb_set_serial_port_data(serial->port[i], NULL);

	}

	return -ENOMEM;



	return 0;

}



static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port,
@@ -709,15 +706,6 @@ static int oti6858_ioctl(struct tty_struct *tty, 
	return -ENOIOCTLCMD;

}





static void oti6858_release(struct usb_serial *serial)

{

	int i;



	for (i = 0; i < serial->num_ports; ++i)

		kfree(usb_get_serial_port_data(serial->port[i]));

}



static void oti6858_read_int_callback(struct urb *urb)

{

	struct usb_serial_port *port =  urb->context;

CRA Git | Maintained and supported by SUSTech CRA and CCSE