Changeset 55346870 in mainline

Timestamp:

2015-07-04T03:47:55Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eb34d8e

Parents:

b5f813c

Message:

uhci,ohci,ehci: Fix memory leaks in error paths.

Location:

uspace/drv/bus/usb

Files:

• ehci/main.c (modified) (1 diff)
• ohci/main.c (modified) (1 diff)
• uhci/main.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/main.c

@@ -80 +80 @@
 
         const int ret = hc_init(instance, res, irq);
-        if (ret == EOK)
+        if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
         return ret;
 }

uspace/drv/bus/usb/ohci/main.c

@@ -75 +75 @@
 
         const int ret = hc_init(instance, res, irq);
-        if (ret == EOK)
+        if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
         return ret;
 }

uspace/drv/bus/usb/uhci/main.c

@@ -76 +76 @@
 
         const int ret = hc_init(instance, res, irq);
-        if (ret == EOK)
+        if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
         return ret;
 }