mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 11:28:32 +00:00
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: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0978c94999
commit
5d8c61bc28
1 changed files with 7 additions and 7 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue