aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-18 05:43:28 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-18 11:08:47 -0400
commit5d8c61bc283826827e1f06816c146bfc507d3834 (patch)
tree9be1821e935b023f468a679f7504ca4000984595
parent0978c9499944d0670338fd048a3bdb1624dc66dc (diff)
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>
-rw-r--r--drivers/usb/serial/io_ti.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 9ae65d679f02..60023c2d2a31 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2578,13 +2578,6 @@ static int edge_port_probe(struct usb_serial_port *port)
2578 return -ENOMEM; 2578 return -ENOMEM;
2579 } 2579 }
2580 2580
2581 ret = edge_create_sysfs_attrs(port);
2582 if (ret) {
2583 kfifo_free(&edge_port->write_fifo);
2584 kfree(edge_port);
2585 return ret;
2586 }
2587
2588 spin_lock_init(&edge_port->ep_lock); 2581 spin_lock_init(&edge_port->ep_lock);
2589 edge_port->port = port; 2582 edge_port->port = port;
2590 edge_port->edge_serial = usb_get_serial_data(port->serial); 2583 edge_port->edge_serial = usb_get_serial_data(port->serial);
@@ -2592,6 +2585,13 @@ static int edge_port_probe(struct usb_serial_port *port)
2592 2585
2593 usb_set_serial_port_data(port, edge_port); 2586 usb_set_serial_port_data(port, edge_port);
2594 2587
2588 ret = edge_create_sysfs_attrs(port);
2589 if (ret) {
2590 kfifo_free(&edge_port->write_fifo);
2591 kfree(edge_port);
2592 return ret;
2593 }
2594
2595 return 0; 2595 return 0;
2596} 2596}
2597 2597