Changeset a4cf312 in mainline

Timestamp:

2019-06-05T13:58:08Z (5 years ago)

Author:

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

Branches:

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

Children:

58168e0

Parents:

a18da67

Message:

Fix build with -fsanitize=undefined

Location:

uspace/lib

Files:

• c/generic/ubsan.c (modified) (6 diffs)
• crypto/crypto.c (modified) (2 diffs)

uspace/lib/c/generic/ubsan.c

@@ -35 +35 @@
 };
 
+struct type_mismatch_data_v1 {
+        struct source_location loc;
+        struct type_descriptor *type;
+        unsigned char log_alignment;
+        unsigned char type_check_kind;
+};
+
 struct overflow_data {
         struct source_location loc;
@@ -73 +80 @@
         struct source_location loc;
         struct source_location attr_loc;
+};
+
+struct pointer_overflow_data {
+        struct source_location loc;
 };
 
@@ -81 +92 @@
  */
 void __ubsan_handle_type_mismatch(struct type_mismatch_data *data, unsigned long ptr);
+void __ubsan_handle_type_mismatch_v1(struct type_mismatch_data_v1 *data, unsigned long ptr);
 void __ubsan_handle_add_overflow(struct overflow_data *data, unsigned long lhs, unsigned long rhs);
 void __ubsan_handle_sub_overflow(struct overflow_data *data, unsigned long lhs, unsigned long rhs);
@@ -99 +111 @@
 void __ubsan_handle_nonnull_return(struct nonnull_return_data *data);
 void __ubsan_handle_builtin_unreachable(struct unreachable_data *data);
+void __ubsan_handle_pointer_overflow(struct pointer_overflow_data *data,
+    unsigned long base, unsigned long result);
 
 static void print_loc(const char *func, struct source_location *loc)
@@ -121 +135 @@
 }
 
+void __ubsan_handle_type_mismatch_v1(struct type_mismatch_data_v1 *data,
+    unsigned long ptr)
+{
+        print_loc(__func__, &data->loc);
+        PRINTF("Type: %s, alignment: %hhu, type_check_kind: %hhu\n",
+            data->type->type_name, data->log_alignment, data->type_check_kind);
+        ubsan_panic();
+}
+
 void __ubsan_handle_add_overflow(struct overflow_data *data,
     unsigned long lhs,
@@ -228 +251 @@
         ubsan_panic();
 }
+
+void __ubsan_handle_pointer_overflow(struct pointer_overflow_data *data,
+    unsigned long base, unsigned long result)
+{
+        print_loc(__func__, &data->loc);
+        ubsan_panic();
+}

uspace/lib/crypto/crypto.c

@@ -32 +32 @@
  */
 
+#include <assert.h>
 #include <str.h>
 #include <macros.h>
 #include <errno.h>
 #include <byteorder.h>
+#include <limits.h>
 #include "crypto.h"
 
@@ -197 +199 @@
     hash_func_t hash_sel)
 {
+        assert(input_size < SSIZE_MAX);
+
         if (!input)
                 return EINVAL;