Changeset 831aa466 in mainline

Timestamp:

2018-06-26T23:16:12Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

2fc9bfd

Parents:

70fae4e

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-26 23:06:11)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-26 23:16:12)

Message:

Fix cases of undefined behavior found by ubsan.

Location:

uspace

Files:

• drv/bus/usb/xhci/endpoint.c (modified) (1 diff)
• lib/c/generic/ubsan.c (modified) (4 diffs)
• lib/drv/generic/remote_usb.c (modified) (1 diff)
• lib/usb/include/usb/request.h (modified) (2 diffs)
• lib/usbhost/src/usb2_bus.c (modified) (1 diff)

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

@@ -102 +102 @@
         if (dev->speed >= USB_SPEED_HIGH ||
             ep->transfer_type != USB_TRANSFER_INTERRUPT) {
-                xhci_ep->interval = 1 << (xhci_ep->interval - 1);
+
+                if (xhci_ep->interval > 0)
+                        xhci_ep->interval = 1 << (xhci_ep->interval - 1);
         }
 

uspace/lib/c/generic/ubsan.c

@@ -98 +98 @@
 #endif
 void __ubsan_handle_nonnull_return(struct nonnull_return_data *data);
+void __ubsan_handle_builtin_unreachable(struct unreachable_data *data);
 
 static void print_loc(const char *func, struct source_location *loc)
@@ -107 +108 @@
                 f += sizeof(func_prefix);
 
-        PRINTF("Undefined behavior %s at %s:%" PRIu32 " col %" PRIu32 "\n",
+        PRINTF("####### Undefined behavior %s at %s:%" PRIu32 " col %" PRIu32 "\n",
             f, loc->file_name, loc->line, loc->column);
 }
@@ -115 +116 @@
 {
         print_loc(__func__, &data->loc);
+        PRINTF("Type: %s, alignment: %lu, type_check_kind: %hhu\n",
+            data->type->type_name, data->alignment, data->type_check_kind);
         ubsan_panic();
 }
@@ -219 +222 @@
         ubsan_panic();
 }
+
+void __ubsan_handle_builtin_unreachable(struct unreachable_data *data)
+{
+        print_loc(__func__, &data->loc);
+        ubsan_panic();
+}
+

uspace/lib/drv/generic/remote_usb.c

@@ -77 +77 @@
                 return EBADMEM;
 
-        usb_device_desc_t tmp_desc;
+        sysarg_t address, depth, speed, handle, iface;
 
         const errno_t ret = async_req_1_5(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_MY_DESCRIPTION,
-            (sysarg_t *) &tmp_desc.address,
-            (sysarg_t *) &tmp_desc.depth,
-            (sysarg_t *) &tmp_desc.speed,
-            &tmp_desc.handle,
-            (sysarg_t *) &tmp_desc.iface);
-        if (ret == EOK && desc)
-                *desc = tmp_desc;
+            IPC_M_USB_GET_MY_DESCRIPTION, &address, &depth, &speed, &handle,
+            &iface);
+        if (ret == EOK && desc) {
+                *desc = (usb_device_desc_t) {
+                        .address = address,
+                        .depth = depth,
+                        .speed = speed,
+                        .handle = handle,
+                        .iface = iface,
+                };
+        }
+
         return ret;
 }

uspace/lib/usb/include/usb/request.h

@@ -75 +75 @@
 #define USB_SETUP_PACKET_SIZE 8
 
-/** Device request setup packet.
- * The setup packet describes the request.
- */
-typedef struct {
-        /** Request type.
-         * The type combines transfer direction, request type and
-         * intended recipient.
-         */
-        uint8_t request_type;
 #define SETUP_REQUEST_TYPE_DEVICE_TO_HOST (1 << 7)
 #define SETUP_REQUEST_TYPE_HOST_TO_DEVICE (0 << 7)
@@ -94 +85 @@
     (uint8_t)(((type & 0x3) << 5) | (recipient & 0x1f))
 
-        /** Request identification. */
-        uint8_t request;
-        /** Main parameter to the request. */
-        union __attribute__((packed)) {
-                uint16_t value;
-                /* FIXME: add #ifdefs according to host endianness */
-                struct __attribute__((packed)) {
-                        uint8_t value_low;
-                        uint8_t value_high;
+/** Device request setup packet.
+ * The setup packet describes the request.
+ */
+typedef union {
+        struct __attribute__((packed)) {
+                /** Request type.
+                 * The type combines transfer direction, request type and
+                 * intended recipient.
+                 */
+                uint8_t request_type;
+
+                /** Request identification. */
+                uint8_t request;
+                /** Main parameter to the request. */
+                union __attribute__((packed)) {
+                        uint16_t value;
+                        /* FIXME: add #ifdefs according to host endianness */
+                        struct __attribute__((packed)) {
+                                uint8_t value_low;
+                                uint8_t value_high;
+                        };
                 };
+                /** Auxiliary parameter to the request.
+                 * Typically, it is offset to something.
+                 */
+                uint16_t index;
+                /** Length of extra data. */
+                uint16_t length;
         };
-        /** Auxiliary parameter to the request.
-         * Typically, it is offset to something.
-         */
-        uint16_t index;
-        /** Length of extra data. */
-        uint16_t length;
+        uint64_t raw;
 } __attribute__((packed)) usb_device_request_setup_packet_t;
 

uspace/lib/usbhost/src/usb2_bus.c

@@ -142 +142 @@
         usb_log_debug("Device(%d): Setting USB address.", address);
         err = bus_device_send_batch_sync(dev, usb2_default_target, USB_DIRECTION_OUT,
-            NULL, 0, *(uint64_t *)&set_address, "set address", NULL);
+            NULL, 0, set_address.raw, "set address", NULL);
         if (err) {
                 usb_log_error("Device(%d): Failed to set new address: %s.",