]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
USB: io_ti: fix sysfs-attribute creation
authorJohan Hovold <jhovold@gmail.com>
Thu, 18 Oct 2012 09:43:28 +0000 (11:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Oct 2012 15:08:47 +0000 (08:08 -0700)
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>
drivers/usb/serial/io_ti.c

index 9ae65d679f025f23739ad4ed9452511708eb5fbd..60023c2d2a317008d7aab0c78bd5120f77b1597c 100644 (file)
@@ -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;
 }