Changeset 18092dd3 in mainline

Timestamp:

2018-01-29T13:23:28Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7bdfcaf

Parents:

702729e

Message:

usb hc: fixed leaking reference in enumeration

Location:

uspace

Files:

• drv/bus/usb/xhci/device.c (modified) (2 diffs)
• lib/usbhost/src/usb2_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/xhci/device.c

@@ -81 +81 @@
         usb_log_debug("Obtained slot ID: %u.", dev->slot_id);
 
+        /* Temporary reference */
         endpoint_t *ep0_base;
         if ((err = bus_endpoint_add(&dev->base, &ep0_initial_desc, &ep0_base)))
@@ -93 +94 @@
                 goto err_added;
 
+        /* Temporary reference */
+        endpoint_del_ref(ep0_base);
+
         return EOK;
 
 err_added:
-        /* Bus reference */
+        bus_endpoint_remove(ep0_base);
+        /* Temporary reference */
         endpoint_del_ref(ep0_base);
-        dev->base.endpoints[0] = NULL;
 err_slot:
         hc_disable_slot(dev);

uspace/lib/usbhost/src/usb2_bus.c

@@ -122 +122 @@
             .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
         };
+
+        /* Temporary reference */
         endpoint_t *default_ep;
         err = bus_endpoint_add(dev, &ep0_desc, &default_ep);
@@ -162 +164 @@
         }
 
+        /* Temporary reference */
+        endpoint_del_ref(default_ep);
+
         return EOK;
 
 err_default_control_ep:
         bus_endpoint_remove(default_ep);
+        /* Temporary reference */
+        endpoint_del_ref(default_ep);
 err_address:
         release_address(helper, address);