Full UBSan support - many fixes!

4 files changed, 37 insertions, 12 deletions

diff --git a/libc/inc/def.h b/libc/inc/def.h
index 8ff6d81..c8b9dbf 100644
--- a/libc/inc/def.h
+++ b/libc/inc/def.h
@@ -25,6 +25,8 @@ typedef unsigned long long u64;
 
 #define UNUSED(a) ((void)(a))
 
+#define NO_SANITIZE __attribute__((no_sanitize("undefined")))
+
 #define EOF (-1)
 #define NULL ((void *)0)
 
diff --git a/libc/mem.c b/libc/mem.c
index 7e9590a..971315a 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -291,8 +291,10 @@ void heap_init(u32 start)
 	heap.end = (u32)start + HEAP_INIT_SIZE;
 }
 
+#define ALIGN sizeof(long)
 static void *_malloc(u32 size)
 {
+	size = ((size + ALIGN - 1) / ALIGN) * ALIGN; // Alignment
 	u32 index = bin_index(size);
 	struct h_bin *temp = (struct h_bin *)&heap.bins[index];
 	struct h_node *found = node_best_fit(temp, size);
diff --git a/libc/print.c b/libc/print.c
index 3f6c1cd..ef51e1f 100644
--- a/libc/print.c
+++ b/libc/print.c
@@ -3,6 +3,7 @@
 #include <arg.h>
 #include <assert.h>
 #include <conv.h>
+#include <cpu.h>
 #include <def.h>
 #include <mem.h>
 #include <serial.h>
@@ -217,14 +218,17 @@ int print(const char *str)
 
 void panic(const char *format, ...)
 {
+	char buf[1024] = { 0 };
 	va_list ap;
 	va_start(ap, format);
+	vsprintf(buf, format, ap);
+	va_end(ap);
 #ifdef kernel
-	vprintf(format, ap);
+	print(buf);
+	loop();
 #else
-	vfprintf(PATH_ERR, format, ap);
+	err(1, buf);
 #endif
-	va_end(ap);
-
-	assert(0);
+	while (1)
+		;
 }
diff --git a/libc/sanitize.c b/libc/sanitize.c
index d4eed01..983b10f 100644
--- a/libc/sanitize.c
+++ b/libc/sanitize.c
@@ -26,6 +26,7 @@ void __stack_chk_fail_local(void)
 
 /**
  * UBSan
+ * TODO: Fix san-paths for userspace (maybe due to -fPIE?)
  */
 
 #define is_aligned(value, alignment) !(value & (alignment - 1))
@@ -45,7 +46,7 @@ struct type_descriptor {
 struct type_mismatch {
 	struct source_location location;
 	struct type_descriptor *type;
-	u32 alignment;
+	u8 alignment;
 	u8 type_check_kind;
 };
 
@@ -132,7 +133,8 @@ void __ubsan_handle_divrem_overflow(struct overflow *data, void *left, void *rig
 	UNUSED(left);
 	UNUSED(right);
 	struct source_location *loc = &data->location;
-	panic("%s:%d: UBSAN: divrem-overflow\n", loc->file, loc->line);
+	panic("%s:%d: UBSAN: divrem-overflow (probably div-by-zero) [type: %s]\n", loc->file,
+	      loc->line, data->type->name);
 }
 
 void __ubsan_handle_out_of_bounds(struct out_of_bounds *data, void *value);
@@ -146,16 +148,31 @@ void __ubsan_handle_out_of_bounds(struct out_of_bounds *data, void *value)
 void __ubsan_handle_type_mismatch_v1(struct type_mismatch *data, u32 ptr);
 void __ubsan_handle_type_mismatch_v1(struct type_mismatch *data, u32 ptr)
 {
+	static const char *kinds[] = {
+		"Load of",
+		"Store to",
+		"Reference binding to",
+		"Member access within",
+		"Member call on",
+		"Constructor call on",
+		"Downcast of",
+		"Downcast of",
+		"Upcast of",
+		"Cast to virtual base of",
+		"Nonnull binding to",
+		"Dynamic operation on",
+	};
+
 	struct source_location *loc = &data->location;
 	const char *msg = "";
 	if (ptr == 0) {
-		msg = "Null pointer access";
+		msg = "null pointer";
 	} else if (data->alignment != 0 && is_aligned(ptr, data->alignment))
-		msg = "Misaligned memory access";
+		msg = "misaligned memory address";
 	else
-		msg = "Insufficient space";
-	panic("%s:%d: UBSAN: type-mismatch-v1: %s [type: %s]\n", loc->file, loc->line, msg,
-	      data->type->name);
+		msg = "address with insufficient space";
+	panic("%s:%d: UBSAN: %s %s [type: %s; addr: 0x%x; align: %d]\n", loc->file, loc->line,
+	      kinds[data->type_check_kind], msg, data->type->name, ptr, data->alignment);
 }
 
 void __ubsan_handle_alignment_assumption(void);