mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-05 23:28:48 +00:00
Merge pull request #5286 from Feoramund/no-san-mem
Add `@(no_sanitize_memory)` with additions to `base:sanitizer`
This commit is contained in:
@@ -0,0 +1,74 @@
|
|||||||
|
#+no-instrumentation
|
||||||
|
package sanitizer
|
||||||
|
|
||||||
|
@(private="file")
|
||||||
|
MSAN_ENABLED :: .Memory in ODIN_SANITIZER_FLAGS
|
||||||
|
|
||||||
|
@(private="file")
|
||||||
|
@(default_calling_convention="system")
|
||||||
|
foreign {
|
||||||
|
__msan_unpoison :: proc(addr: rawptr, size: uint) ---
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Marks a slice as fully initialized.
|
||||||
|
|
||||||
|
Code instrumented with `-sanitize:memory` will be permitted to access any
|
||||||
|
address within the slice as if it had already been initialized.
|
||||||
|
|
||||||
|
When msan is not enabled this procedure does nothing.
|
||||||
|
*/
|
||||||
|
memory_unpoison_slice :: proc "contextless" (region: $T/[]$E) {
|
||||||
|
when MSAN_ENABLED {
|
||||||
|
__msan_unpoison(raw_data(region), size_of(E) * len(region))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Marks a pointer as fully initialized.
|
||||||
|
|
||||||
|
Code instrumented with `-sanitize:memory` will be permitted to access memory
|
||||||
|
within the region the pointer points to as if it had already been initialized.
|
||||||
|
|
||||||
|
When msan is not enabled this procedure does nothing.
|
||||||
|
*/
|
||||||
|
memory_unpoison_ptr :: proc "contextless" (ptr: ^$T) {
|
||||||
|
when MSAN_ENABLED {
|
||||||
|
__msan_unpoison(ptr, size_of(T))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Marks the region covering `[ptr, ptr+len)` as fully initialized.
|
||||||
|
|
||||||
|
Code instrumented with `-sanitize:memory` will be permitted to access memory
|
||||||
|
within this range as if it had already been initialized.
|
||||||
|
|
||||||
|
When msan is not enabled this procedure does nothing.
|
||||||
|
*/
|
||||||
|
memory_unpoison_rawptr :: proc "contextless" (ptr: rawptr, len: int) {
|
||||||
|
when MSAN_ENABLED {
|
||||||
|
__msan_unpoison(ptr, uint(len))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Marks the region covering `[ptr, ptr+len)` as fully initialized.
|
||||||
|
|
||||||
|
Code instrumented with `-sanitize:memory` will be permitted to access memory
|
||||||
|
within this range as if it had already been initialized.
|
||||||
|
|
||||||
|
When msan is not enabled this procedure does nothing.
|
||||||
|
*/
|
||||||
|
memory_unpoison_rawptr_uint :: proc "contextless" (ptr: rawptr, len: uint) {
|
||||||
|
when MSAN_ENABLED {
|
||||||
|
__msan_unpoison(ptr, len)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
memory_unpoison :: proc {
|
||||||
|
memory_unpoison_slice,
|
||||||
|
memory_unpoison_ptr,
|
||||||
|
memory_unpoison_rawptr,
|
||||||
|
memory_unpoison_rawptr_uint,
|
||||||
|
}
|
||||||
@@ -269,6 +269,7 @@ _write_at :: proc(f: ^File_Impl, p: []byte, offset: i64) -> (nt: i64, err: Error
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@(no_sanitize_memory)
|
||||||
_file_size :: proc(f: ^File_Impl) -> (n: i64, err: Error) {
|
_file_size :: proc(f: ^File_Impl) -> (n: i64, err: Error) {
|
||||||
// TODO: Identify 0-sized "pseudo" files and return No_Size. This would
|
// TODO: Identify 0-sized "pseudo" files and return No_Size. This would
|
||||||
// eliminate the need for the _read_entire_pseudo_file procs.
|
// eliminate the need for the _read_entire_pseudo_file procs.
|
||||||
|
|||||||
@@ -662,7 +662,7 @@ last_write_time_by_name :: proc(name: string) -> (File_Time, Error) {
|
|||||||
return File_Time(modified), nil
|
return File_Time(modified), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -674,7 +674,7 @@ _stat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -688,7 +688,7 @@ _lstat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
||||||
s: OS_Stat = ---
|
s: OS_Stat = ---
|
||||||
result := _unix_fstat(fd, &s)
|
result := _unix_fstat(fd, &s)
|
||||||
|
|||||||
@@ -325,7 +325,7 @@ _alloc_command_line_arguments :: proc() -> []string {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -339,7 +339,7 @@ _stat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -353,7 +353,7 @@ _lstat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
||||||
// deliberately uninitialized
|
// deliberately uninitialized
|
||||||
s: OS_Stat = ---
|
s: OS_Stat = ---
|
||||||
|
|||||||
@@ -674,7 +674,7 @@ seek :: proc(fd: Handle, offset: i64, whence: int) -> (i64, Error) {
|
|||||||
return i64(res), nil
|
return i64(res), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(require_results)
|
@(require_results, no_sanitize_memory)
|
||||||
file_size :: proc(fd: Handle) -> (i64, Error) {
|
file_size :: proc(fd: Handle) -> (i64, Error) {
|
||||||
// deliberately uninitialized; the syscall fills this buffer for us
|
// deliberately uninitialized; the syscall fills this buffer for us
|
||||||
s: OS_Stat = ---
|
s: OS_Stat = ---
|
||||||
@@ -794,7 +794,7 @@ last_write_time_by_name :: proc(name: string) -> (time: File_Time, err: Error) {
|
|||||||
return File_Time(modified), nil
|
return File_Time(modified), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -808,7 +808,7 @@ _stat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -822,7 +822,7 @@ _lstat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
||||||
// deliberately uninitialized; the syscall fills this buffer for us
|
// deliberately uninitialized; the syscall fills this buffer for us
|
||||||
s: OS_Stat = ---
|
s: OS_Stat = ---
|
||||||
|
|||||||
@@ -724,7 +724,7 @@ last_write_time_by_name :: proc(name: string) -> (time: File_Time, err: Error) {
|
|||||||
return File_Time(modified), nil
|
return File_Time(modified), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -736,7 +736,7 @@ _stat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -750,7 +750,7 @@ _lstat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
||||||
s: OS_Stat = ---
|
s: OS_Stat = ---
|
||||||
result := _unix_fstat(fd, &s)
|
result := _unix_fstat(fd, &s)
|
||||||
|
|||||||
@@ -639,7 +639,7 @@ last_write_time_by_name :: proc(name: string) -> (time: File_Time, err: Error) {
|
|||||||
return File_Time(modified), nil
|
return File_Time(modified), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
_stat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -653,7 +653,7 @@ _stat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
_lstat :: proc(path: string) -> (OS_Stat, Error) {
|
||||||
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD()
|
||||||
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
cstr := strings.clone_to_cstring(path, context.temp_allocator)
|
||||||
@@ -667,7 +667,7 @@ _lstat :: proc(path: string) -> (OS_Stat, Error) {
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@(private, require_results)
|
@(private, require_results, no_sanitize_memory)
|
||||||
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
_fstat :: proc(fd: Handle) -> (OS_Stat, Error) {
|
||||||
// deliberately uninitialized
|
// deliberately uninitialized
|
||||||
s: OS_Stat = ---
|
s: OS_Stat = ---
|
||||||
|
|||||||
@@ -1370,6 +1370,7 @@ gb_internal void check_proc_decl(CheckerContext *ctx, Entity *e, DeclInfo *d) {
|
|||||||
e->Procedure.has_instrumentation = has_instrumentation;
|
e->Procedure.has_instrumentation = has_instrumentation;
|
||||||
|
|
||||||
e->Procedure.no_sanitize_address = ac.no_sanitize_address;
|
e->Procedure.no_sanitize_address = ac.no_sanitize_address;
|
||||||
|
e->Procedure.no_sanitize_memory = ac.no_sanitize_memory;
|
||||||
|
|
||||||
e->deprecated_message = ac.deprecated_message;
|
e->deprecated_message = ac.deprecated_message;
|
||||||
e->warning_message = ac.warning_message;
|
e->warning_message = ac.warning_message;
|
||||||
|
|||||||
@@ -3776,6 +3776,12 @@ gb_internal DECL_ATTRIBUTE_PROC(proc_decl_attribute) {
|
|||||||
}
|
}
|
||||||
ac->no_sanitize_address = true;
|
ac->no_sanitize_address = true;
|
||||||
return true;
|
return true;
|
||||||
|
} else if (name == "no_sanitize_memory") {
|
||||||
|
if (value != nullptr) {
|
||||||
|
error(value, "'%.*s' expects no parameter", LIT(name));
|
||||||
|
}
|
||||||
|
ac->no_sanitize_memory = true;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ struct AttributeContext {
|
|||||||
bool instrumentation_enter : 1;
|
bool instrumentation_enter : 1;
|
||||||
bool instrumentation_exit : 1;
|
bool instrumentation_exit : 1;
|
||||||
bool no_sanitize_address : 1;
|
bool no_sanitize_address : 1;
|
||||||
|
bool no_sanitize_memory : 1;
|
||||||
bool rodata : 1;
|
bool rodata : 1;
|
||||||
bool ignore_duplicates : 1;
|
bool ignore_duplicates : 1;
|
||||||
u32 optimization_mode; // ProcedureOptimizationMode
|
u32 optimization_mode; // ProcedureOptimizationMode
|
||||||
|
|||||||
@@ -263,6 +263,7 @@ struct Entity {
|
|||||||
bool uses_branch_location : 1;
|
bool uses_branch_location : 1;
|
||||||
bool is_anonymous : 1;
|
bool is_anonymous : 1;
|
||||||
bool no_sanitize_address : 1;
|
bool no_sanitize_address : 1;
|
||||||
|
bool no_sanitize_memory : 1;
|
||||||
} Procedure;
|
} Procedure;
|
||||||
struct {
|
struct {
|
||||||
Array<Entity *> entities;
|
Array<Entity *> entities;
|
||||||
|
|||||||
@@ -345,7 +345,7 @@ gb_internal lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool i
|
|||||||
if (build_context.sanitizer_flags & SanitizerFlag_Address && !entity->Procedure.no_sanitize_address) {
|
if (build_context.sanitizer_flags & SanitizerFlag_Address && !entity->Procedure.no_sanitize_address) {
|
||||||
lb_add_attribute_to_proc(m, p->value, "sanitize_address");
|
lb_add_attribute_to_proc(m, p->value, "sanitize_address");
|
||||||
}
|
}
|
||||||
if (build_context.sanitizer_flags & SanitizerFlag_Memory) {
|
if (build_context.sanitizer_flags & SanitizerFlag_Memory && !entity->Procedure.no_sanitize_memory) {
|
||||||
lb_add_attribute_to_proc(m, p->value, "sanitize_memory");
|
lb_add_attribute_to_proc(m, p->value, "sanitize_memory");
|
||||||
}
|
}
|
||||||
if (build_context.sanitizer_flags & SanitizerFlag_Thread) {
|
if (build_context.sanitizer_flags & SanitizerFlag_Thread) {
|
||||||
|
|||||||
Reference in New Issue
Block a user