Changeset e27c2476 in mainline

Timestamp:

2011-10-29T20:37:48Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

96ec0a9

Parents:

c44a5f1

Message:

usbhub: Fix double free in error paths.

Remove redundant usb_hub_dev_create.

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (9 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -68 +68 @@
 
 static int usb_set_first_configuration(usb_device_t *usb_device);
-static usb_hub_dev_t * usb_hub_dev_create(usb_device_t *usb_dev);
 static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev);
 static void usb_hub_over_current(const usb_hub_dev_t *hub_dev,
@@ -133 +132 @@
         assert(usb_dev);
         /* Create driver soft-state structure */
-        usb_hub_dev_t *hub_dev = usb_hub_dev_create(usb_dev);
+        usb_hub_dev_t *hub_dev =
+            usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t));
         if (hub_dev == NULL) {
                 usb_log_error("Failed to create hun driver structure.\n");
                 return ENOMEM;
         }
+        hub_dev->usb_device = usb_dev;
+        hub_dev->pending_ops_count = 0;
+        hub_dev->running = false;
+        fibril_mutex_initialize(&hub_dev->pending_ops_mutex);
+        fibril_condvar_initialize(&hub_dev->pending_ops_cv);
 
         /* Create hc connection */
@@ -146 +151 @@
                 usb_log_error("Could not initialize connection to device: %s\n",
                     str_error(opResult));
-                free(hub_dev);
                 return opResult;
         }
@@ -155 +159 @@
                 usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
-                free(hub_dev);
                 return opResult;
         }
@@ -164 +167 @@
                 usb_log_error("Could process hub specific info, %s\n",
                     str_error(opResult));
-                free(hub_dev);
                 return opResult;
         }
@@ -173 +175 @@
         if (hub_dev->hub_fun == NULL) {
                 usb_log_error("Failed to create hub function.\n");
-                free(hub_dev);
                 return ENOMEM;
         }
@@ -181 +182 @@
                 usb_log_error("Failed to bind hub function: %s.\n",
                    str_error(opResult));
-                free(hub_dev);
                 ddf_fun_destroy(hub_dev->hub_fun);
                 return opResult;
@@ -193 +193 @@
                 ddf_fun_unbind(hub_dev->hub_fun);
                 ddf_fun_destroy(hub_dev->hub_fun);
-                free(hub_dev);
                 usb_log_error("Failed to create polling fibril: %s.\n",
                     str_error(opResult));
@@ -240 +239 @@
         }
         return true;
-}
-/*----------------------------------------------------------------------------*/
-/**
- * create usb_hub_dev_t structure
- *
- * Does only basic copying of known information into new structure.
- * @param usb_dev usb device structure
- * @return basic usb_hub_dev_t structure
- */
-static usb_hub_dev_t * usb_hub_dev_create(usb_device_t *usb_dev)
-{
-        assert(usb_dev);
-        usb_hub_dev_t *hub_dev =
-            usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t));
-        if (!hub_dev)
-            return NULL;
-
-        hub_dev->usb_device = usb_dev;
-        hub_dev->ports = NULL;
-        hub_dev->port_count = 0;
-        hub_dev->pending_ops_count = 0;
-        hub_dev->running = false;
-        fibril_mutex_initialize(&hub_dev->pending_ops_mutex);
-        fibril_condvar_initialize(&hub_dev->pending_ops_cv);
-
-        return hub_dev;
 }
 /*----------------------------------------------------------------------------*/