Changeset a6afb4c in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2018-01-23T14:02:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

4db49344

Parents:

e7e1fd3

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-23 13:35:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-23 14:02:35)

Message:

usbhost: check validity of arguments, cleanup

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (4 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -154 +154 @@
         int err;
 
+        if (!usb_speed_is_valid(speed))
+                return EINVAL;
+
         usb_log_debug("Hub %d reported a new %s speed device on port: %u",
             hub->address, usb_str_speed(speed), port);
@@ -212 +215 @@
 
         if (!victim) {
-                usb_log_warning("Hub '%s' tried to remove non-existant"
+                usb_log_warning("Hub '%s' tried to remove non-existent"
                     " device.", ddf_fun_get_name(fun));
                 return ENOENT;
@@ -271 +274 @@
         target.address = dev->address;
 
+        if (!usb_target_is_valid(&target))
+                return EINVAL;
+
+        if (size > 0 && data == NULL)
+                return EBADMEM;
+
+        if (!callback && arg)
+                return EBADMEM;
+
         return bus_device_send_batch(dev, target, USB_DIRECTION_IN,
             data, size, setup_data,
@@ -295 +307 @@
 
         target.address = dev->address;
+
+        if (!usb_target_is_valid(&target))
+                return EINVAL;
+
+        if (size > 0 && data == NULL)
+                return EBADMEM;
+
+        if (!callback && arg)
+                return EBADMEM;
 
         return bus_device_send_batch(dev, target, USB_DIRECTION_OUT,