diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index fbe9953547..fb49685f11 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -270,7 +270,7 @@ set(SOURCES ${C_SOURCES} ) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=nonnull-attribute,bool,vla-bound,signed-integer-overflow,shift,shift-exponent,shift-base,integer-divide-by-zero,return,bounds,bounds-strict") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=nonnull-attribute,bool,vla-bound,signed-integer-overflow,shift,shift-exponent,shift-base,integer-divide-by-zero,return,bounds,bounds-strict,object-size,enum,vptr") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -DKERNEL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE -fno-rtti -ffreestanding -fbuiltin") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-80387 -mno-mmx -mno-sse -mno-sse2") diff --git a/Kernel/UBSanitizer.cpp b/Kernel/UBSanitizer.cpp index 23edcd1eff..073abc6eb4 100644 --- a/Kernel/UBSanitizer.cpp +++ b/Kernel/UBSanitizer.cpp @@ -108,4 +108,11 @@ void __ubsan_handle_out_of_bounds(const OutOfBoundsData& data, void*) dbgln("KUBSAN: out of bounds access into array of {} ({}-bit), index type {} ({}-bit)", data.array_type.name(), data.array_type.bit_width(), data.index_type.name(), data.index_type.bit_width()); print_location(data.location); } + +void __ubsan_handle_type_mismatch_v1(const TypeMismatchData&, void*); +void __ubsan_handle_type_mismatch_v1(const TypeMismatchData& data, void*) +{ + dbgln("KUBSAN: type mismatch, {} ({}-bit)", data.type.name(), data.type.bit_width()); + print_location(data.location); +} } diff --git a/Kernel/UBSanitizer.h b/Kernel/UBSanitizer.h index 34491483e8..23889529f0 100644 --- a/Kernel/UBSanitizer.h +++ b/Kernel/UBSanitizer.h @@ -96,4 +96,11 @@ struct OutOfBoundsData { const TypeDescriptor& index_type; }; +struct TypeMismatchData { + SourceLocation location; + const TypeDescriptor& type; + u8 log_alignment; + u8 type_check_kind; +}; + }