Changeset 90d7033 in mainline

Timestamp:

2011-10-31T11:04:57Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

59c163c

Parents:

10059a68

Message:

libusbdev: Fix memory leak in error path. Check input arguments.

File:

• uspace/lib/usbdev/src/hub.c (modified) (6 diffs)

uspace/lib/usbdev/src/hub.c

@@ -171 +171 @@
  *
  * @param[in] parent Parent device (i.e. the hub device).
- * @param[in] connection Connection to host controller.
+ * @param[in] connection Connection to host controller. Must be non-null.
  * @param[in] dev_speed New device speed.
  * @param[in] enable_port Function for enabling signaling through the port the
@@ -181 +181 @@
  *      as @c driver_data.
  * @param[out] new_fun Storage where pointer to allocated child function
- *      will be written.
+ *      will be written. Must be non-null.
  * @return Error code.
+ * @retval EINVAL Either connection or new_fun is a NULL pointer.
  * @retval ENOENT Connection to HC not opened.
  * @retval EADDRNOTAVAIL Failed retrieving free address from host controller.
@@ -195 +196 @@
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
-        assert(connection != NULL);
+        if (new_fun == NULL || connection == NULL)
+                return EINVAL;
+
         // FIXME: this is awful, we are accessing directly the structure.
+        // TODO: Why not use provided connection?
         usb_hc_connection_t hc_conn = {
                 .hc_handle = connection->hc_handle,
@@ -321 +325 @@
             parent, dev_ops, new_dev_data, &child_fun);
         if (rc != EOK) {
-                rc = ESTALL;
                 goto leave_release_free_address;
         }
@@ -328 +331 @@
          * And now inform the host controller about the handle.
          */
-        usb_hub_attached_device_t new_device = {
+        const usb_hub_attached_device_t new_device = {
                 .address = dev_addr,
                 .fun = child_fun,
@@ -334 +337 @@
         rc = usb_hc_register_device(&hc_conn, &new_device);
         if (rc != EOK) {
+                /* The child function is already created. */
+                child_fun->driver_data = NULL;
+                ddf_fun_destroy(child_fun);
                 rc = EDESTADDRREQ;
                 goto leave_release_free_address;
         }
-
 
         /*