Changeset 44d8853 in mainline for uspace/drv/uhci/uhci_struct/transfer_descriptor.c

Timestamp:

2011-01-28T23:51:36Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4046c1ea, c8ca07e

Parents:

e68de30

Message:

Fixed: Do not crash on zero buffers

File:

• uspace/drv/uhci/uhci_struct/transfer_descriptor.c (modified) (2 diffs)

uspace/drv/uhci/uhci_struct/transfer_descriptor.c

@@ -27 +27 @@
         uhci_print_verbose("Creating device field: %x.\n", instance->device);
 
-        instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
+        if (size) {
+                instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
 
-        uhci_print_verbose("Creating buffer field: %p(%p).\n",
-          buffer, instance->buffer_ptr);
+                uhci_print_verbose("Creating buffer field: %p(%p).\n",
+                        buffer, instance->buffer_ptr);
 
-        char * buff = buffer;
+                if (size >= 8) {
+                        char * buff = buffer;
 
-        uhci_print_verbose("Buffer dump(8B): %x %x %x %x %x %x %x %x.\n",
-          buff[0], buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7]);
+                        uhci_print_verbose("Buffer dump(8B): %x %x %x %x %x %x %x %x.\n",
+                                buff[0], buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7]);
+                }
+        } else {
+                instance->buffer_ptr = 0;
+        }
 
         instance->next_va = NULL;
         instance->callback = NULL;
+        uhci_print_info("Created a new TD.\n");
 }
 
@@ -74 +81 @@
         callback_run(instance->callback,
                 convert_outcome(instance->status),
-                instance->status >> TD_STATUS_ACTLEN_POS & TD_STATUS_ACTLEN_MASK
+                ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK
         );
 }