Changeset 171cd88 in mainline

Timestamp:

2011-03-18T21:04:01Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

46d12fb

Parents:

f0a1c86

Message:

Make sure new_address index is never out of array bounds (fixes #142)

File:

• uspace/drv/uhci-hcd/utils/device_keeper.c (modified) (2 diffs)

uspace/drv/uhci-hcd/utils/device_keeper.c

@@ -179 +179 @@
         } else {
                 if (toggle) {
-                        instance->devices[target.address].toggle_status |= (1 << target.endpoint);
+                        instance->devices[target.address].toggle_status |=
+                            (1 << target.endpoint);
                 } else {
-                        instance->devices[target.address].toggle_status &= ~(1 << target.endpoint);
+                        instance->devices[target.address].toggle_status &=
+                            ~(1 << target.endpoint);
                 }
                 ret = EOK;
@@ -201 +203 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_address_t new_address = instance->last_address + 1;
-        while (instance->devices[new_address].occupied) {
+        usb_address_t new_address = instance->last_address;
+        do {
+                ++new_address;
+                if (new_address > USB11_ADDRESS_MAX)
+                        new_address = 1;
                 if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
                         return ENOSPC;
                 }
-                if (new_address == USB11_ADDRESS_MAX)
-                        new_address = 1;
-                ++new_address;
-        }
+        } while (instance->devices[new_address].occupied);
 
         assert(new_address != USB_ADDRESS_DEFAULT);