Changeset bf05c74 in mainline for kernel/generic/src/lib/ubsan.c

Timestamp:

2018-10-24T17:59:50Z (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:

5c38838, 889cdb1

Parents:

cfdeedc

Message:

Fix kernel ubsan

File:

• kernel/generic/src/lib/ubsan.c (modified) (5 diffs)

kernel/generic/src/lib/ubsan.c

@@ -34 +34 @@
 };
 
+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;
@@ -72 +79 @@
         struct source_location loc;
         struct source_location attr_loc;
+};
+
+struct pointer_overflow_data {
+        struct source_location loc;
 };
 
@@ -80 +91 @@
  */
 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);
@@ -97 +109 @@
 #endif
 void __ubsan_handle_nonnull_return(struct nonnull_return_data *data);
+void __ubsan_handle_nonnull_return_v1(struct nonnull_return_data *data,
+    struct source_location *loc);
+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)
@@ -218 +234 @@
         ubsan_panic();
 }
+
+void __ubsan_handle_nonnull_return_v1(struct nonnull_return_data *data,
+    struct source_location *loc)
+{
+        print_loc(__func__, &data->loc);
+        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();
+}
+
+void __ubsan_handle_type_mismatch_v1(struct type_mismatch_data_v1 *data,
+    unsigned long ptr)
+{
+        print_loc(__func__, &data->loc);
+        ubsan_panic();
+}