Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d8c61bc authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: io_ti: fix sysfs-attribute creation 



Make sure port data is initialised before creating sysfs attributes to
avoid a race.

A recent patch ("USB: io_ti: fix port-data memory leak") got the
sysfs-attribute creation and port-data initialisation ordering wrong.

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 0978c949

drivers/usb/serial/io_ti.c

+7 −7
Original line number Diff line number Diff line
@@ -2578,13 +2578,6 @@ static int edge_port_probe(struct usb_serial_port *port) 
		return -ENOMEM;

	}



	ret = edge_create_sysfs_attrs(port);

	if (ret) {

		kfifo_free(&edge_port->write_fifo);

		kfree(edge_port);

		return ret;

	}



	spin_lock_init(&edge_port->ep_lock);

	edge_port->port = port;

	edge_port->edge_serial = usb_get_serial_data(port->serial);
@@ -2592,6 +2585,13 @@ static int edge_port_probe(struct usb_serial_port *port) 


	usb_set_serial_port_data(port, edge_port);



	ret = edge_create_sysfs_attrs(port);

	if (ret) {

		kfifo_free(&edge_port->write_fifo);

		kfree(edge_port);

		return ret;

	}



	return 0;

}