mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-06-27 06:48:31 +00:00
Make C memory safe like Rust
This change enables Address Sanitizer systemically w/ `make MODE=dbg`. Our version of Rust's `unsafe` keyword is named `noasan` which is used for two functions that do aligned memory chunking, like `strcpy.c` and we need to fix the tiny DEFLATE code, but that's it everything else is fabulous you can have all the fischer price security blankets you need Best of all is we're now able to use the ASAN data in Blinkenlights to colorize the memory dumps. See the screenshot below of a test program: https://justine.lol/blinkenlights/asan.png Which is operating on float arrays stored on the stack, with red areas indicating poisoned memory, and the green areas indicate valid memory.
This commit is contained in:
parent
fdc3fa9148
commit
1ff9ab95ac
153 changed files with 2545 additions and 2077 deletions
453
libc/log/asan.c
453
libc/log/asan.c
|
@ -1,453 +0,0 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2020 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/bits/safemacros.h"
|
||||
#include "libc/bits/weaken.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/fmt/itoa.h"
|
||||
#include "libc/log/asan.internal.h"
|
||||
#include "libc/log/backtrace.internal.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/mem/hook/hook.h"
|
||||
#include "libc/runtime/directmap.h"
|
||||
#include "libc/runtime/memtrack.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/fileno.h"
|
||||
#include "libc/sysv/consts/map.h"
|
||||
#include "libc/sysv/consts/prot.h"
|
||||
#include "third_party/dlmalloc/dlmalloc.internal.h"
|
||||
|
||||
STATIC_YOINK("_init_asan");
|
||||
|
||||
/**
|
||||
* @fileoverview Cosmopolitan Address Sanitizer Runtime.
|
||||
*
|
||||
* Someone brilliant at Google figured out a way to improve upon memory
|
||||
* protection. Rather than invent another Java or Rust they changed GCC
|
||||
* so it can emit fast code, that checks the validity of each memory op
|
||||
* with byte granularity, by probing shadow memory.
|
||||
*
|
||||
* - AddressSanitizer dedicates one-eighth of the virtual address space
|
||||
* to its shadow memory and uses a direct mapping with a scale and
|
||||
* offset to translate an application address to its corresponding
|
||||
* shadow address. Given the application memory address Addr, the
|
||||
* address of the shadow byte is computed as (Addr>>3)+Offset."
|
||||
*
|
||||
* - We use the following encoding for each shadow byte: 0 means that
|
||||
* all 8 bytes of the corresponding application memory region are
|
||||
* addressable; k (1 ≤ k ≤ 7) means that the first k bytes are
|
||||
* addressible; any negative value indicates that the entire 8-byte
|
||||
* word is unaddressable. We use different negative values to
|
||||
* distinguish between different kinds of unaddressable memory (heap
|
||||
* redzones, stack redzones, global redzones, freed memory).
|
||||
*
|
||||
* Here's what the generated code looks like for 64-bit reads:
|
||||
*
|
||||
* movq %addr,%tmp
|
||||
* shrq $3,%tmp
|
||||
* cmpb $0,0x7fff8000(%tmp)
|
||||
* jnz abort
|
||||
* movq (%addr),%dst
|
||||
*/
|
||||
|
||||
#define HOOK(HOOK, IMPL) \
|
||||
if (weaken(HOOK)) { \
|
||||
*weaken(HOOK) = IMPL; \
|
||||
}
|
||||
|
||||
struct AsanSourceLocation {
|
||||
const char *filename;
|
||||
int line;
|
||||
int column;
|
||||
};
|
||||
|
||||
struct AsanAccessInfo {
|
||||
const char *addr;
|
||||
const char *first_bad_addr;
|
||||
size_t size;
|
||||
bool iswrite;
|
||||
unsigned long ip;
|
||||
};
|
||||
|
||||
struct AsanGlobal {
|
||||
const char *addr;
|
||||
size_t size;
|
||||
size_t size_with_redzone;
|
||||
const void *name;
|
||||
const void *module_name;
|
||||
unsigned long has_cxx_init;
|
||||
struct AsanSourceLocation *location;
|
||||
char *odr_indicator;
|
||||
};
|
||||
|
||||
struct AsanMorgue {
|
||||
unsigned i;
|
||||
void *p[16];
|
||||
};
|
||||
|
||||
static struct AsanMorgue __asan_morgue;
|
||||
|
||||
static const char *__asan_dscribe_free_poison(int c) {
|
||||
switch (c) {
|
||||
case kAsanHeapFree:
|
||||
return "heap double free";
|
||||
case kAsanRelocated:
|
||||
return "free after relocate";
|
||||
case kAsanStackFree:
|
||||
return "stack double free";
|
||||
default:
|
||||
return "invalid pointer";
|
||||
}
|
||||
}
|
||||
|
||||
static const char *__asan_describe_access_poison(int c) {
|
||||
switch (c) {
|
||||
case kAsanHeapFree:
|
||||
return "heap use after free";
|
||||
case kAsanStackFree:
|
||||
return "stack use after release";
|
||||
case kAsanRelocated:
|
||||
return "heap use after relocate";
|
||||
case kAsanHeapUnderrun:
|
||||
return "heap underrun";
|
||||
case kAsanHeapOverrun:
|
||||
return "heap overrun";
|
||||
case kAsanGlobalOverrun:
|
||||
return "global overrun";
|
||||
case kAsanGlobalUnregistered:
|
||||
return "global unregistered";
|
||||
case kAsanStackUnderrun:
|
||||
return "stack underflow";
|
||||
case kAsanStackOverrun:
|
||||
return "stack overflow";
|
||||
case kAsanAllocaOverrun:
|
||||
return "alloca overflow";
|
||||
case kAsanUnscoped:
|
||||
return "unscoped";
|
||||
default:
|
||||
return "poisoned";
|
||||
}
|
||||
}
|
||||
|
||||
static wontreturn void __asan_die(const char *msg, size_t size) {
|
||||
write(STDERR_FILENO, msg, size);
|
||||
__die();
|
||||
}
|
||||
|
||||
static char *__asan_report_start(char *p) {
|
||||
bool ansi;
|
||||
const char *term;
|
||||
term = getenv("TERM");
|
||||
ansi = !term || strcmp(term, "dumb") != 0;
|
||||
if (ansi) p = stpcpy(p, "\r\e[J\e[1;91m");
|
||||
p = stpcpy(p, "asan error");
|
||||
if (ansi) p = stpcpy(p, "\e[0m");
|
||||
return stpcpy(p, ": ");
|
||||
}
|
||||
|
||||
static wontreturn void __asan_report_deallocate_fault(void *addr, int c) {
|
||||
char *p, ibuf[21], buf[256];
|
||||
p = __asan_report_start(buf);
|
||||
p = stpcpy(p, __asan_dscribe_free_poison(c));
|
||||
p = stpcpy(p, " ");
|
||||
p = mempcpy(p, ibuf, int64toarray_radix10(c, ibuf));
|
||||
p = stpcpy(p, " at 0x");
|
||||
p = mempcpy(p, ibuf, uint64toarray_fixed16((intptr_t)addr, ibuf, 48));
|
||||
p = stpcpy(p, "\r\n");
|
||||
__asan_die(buf, p - buf);
|
||||
}
|
||||
|
||||
static wontreturn void __asan_report_memory_fault(uint8_t *addr, int size,
|
||||
const char *kind) {
|
||||
char *p, ibuf[21], buf[256];
|
||||
p = __asan_report_start(buf);
|
||||
p = stpcpy(p, __asan_describe_access_poison(*(char *)SHADOW((intptr_t)addr)));
|
||||
p = stpcpy(p, " ");
|
||||
p = mempcpy(p, ibuf, uint64toarray_radix10(size, ibuf));
|
||||
p = stpcpy(p, "-byte ");
|
||||
p = stpcpy(p, kind);
|
||||
p = stpcpy(p, " at 0x");
|
||||
p = mempcpy(p, ibuf, uint64toarray_fixed16((intptr_t)addr, ibuf, 48));
|
||||
p = stpcpy(p, "\r\n");
|
||||
__asan_die(buf, p - buf);
|
||||
}
|
||||
|
||||
static const void *__asan_morgue_add(void *p) {
|
||||
void *r;
|
||||
r = __asan_morgue.p[__asan_morgue.i];
|
||||
__asan_morgue.p[__asan_morgue.i] = p;
|
||||
__asan_morgue.i += 1;
|
||||
__asan_morgue.i &= ARRAYLEN(__asan_morgue.p) - 1;
|
||||
return r;
|
||||
}
|
||||
|
||||
static void __asan_morgue_flush(void) {
|
||||
void *p;
|
||||
unsigned i;
|
||||
for (i = 0; i < ARRAYLEN(__asan_morgue.p); ++i) {
|
||||
p = __asan_morgue.p[i];
|
||||
__asan_morgue.p[i] = NULL;
|
||||
dlfree(p);
|
||||
}
|
||||
}
|
||||
|
||||
static void *__asan_allocate(size_t align, size_t size, int underrun,
|
||||
int overrun) {
|
||||
char *p, *s;
|
||||
size_t q, r, i;
|
||||
if (!(p = dlmemalign(align, ROUNDUP(size, 8) + 16))) return NULL;
|
||||
s = (char *)SHADOW((intptr_t)p - 16);
|
||||
q = size / 8;
|
||||
r = size % 8;
|
||||
*s++ = underrun;
|
||||
*s++ = underrun;
|
||||
memset(s, 0, q);
|
||||
s += q;
|
||||
if (r) *s++ = r;
|
||||
*s++ = overrun;
|
||||
*s++ = overrun;
|
||||
return p;
|
||||
}
|
||||
|
||||
static void __asan_deallocate(char *p, int kind) {
|
||||
char *s;
|
||||
s = (char *)SHADOW((intptr_t)p);
|
||||
if ((*s < 0 && *s != kAsanHeapOverrun) || *s >= 8) {
|
||||
__asan_report_deallocate_fault(p, *s);
|
||||
}
|
||||
memset(s, kind, dlmalloc_usable_size(p) >> 3);
|
||||
dlfree(__asan_morgue_add(p));
|
||||
}
|
||||
|
||||
static void __asan_poison_redzone(intptr_t addr, size_t size, size_t redsize,
|
||||
int kind) {
|
||||
char *s;
|
||||
intptr_t p;
|
||||
size_t a, b, w;
|
||||
w = (intptr_t)addr & 7;
|
||||
p = (intptr_t)addr - w;
|
||||
a = w + size;
|
||||
b = w + redsize;
|
||||
s = (char *)SHADOW(p + a);
|
||||
if (a & 7) *s++ = a & 7;
|
||||
memset(s, kind, (b - ROUNDUP(a, 8)) >> 3);
|
||||
}
|
||||
|
||||
static size_t __asan_malloc_usable_size(const void *vp) {
|
||||
char *s;
|
||||
size_t n;
|
||||
for (n = 0, s = (char *)SHADOW((intptr_t)vp);; ++s) {
|
||||
if (!*s) {
|
||||
n += 8;
|
||||
} else if (*s > 0) {
|
||||
n += *s & 7;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
static void __asan_free(void *p) {
|
||||
if (!p) return;
|
||||
__asan_deallocate(p, kAsanHeapFree);
|
||||
}
|
||||
|
||||
static void *__asan_memalign(size_t align, size_t size) {
|
||||
return __asan_allocate(align, size, kAsanHeapUnderrun, kAsanHeapOverrun);
|
||||
}
|
||||
|
||||
static void *__asan_malloc(size_t size) {
|
||||
return __asan_memalign(16, size);
|
||||
}
|
||||
|
||||
static void *__asan_calloc(size_t n, size_t m) {
|
||||
char *p;
|
||||
size_t size;
|
||||
if (__builtin_mul_overflow(n, m, &size)) size = -1;
|
||||
if ((p = __asan_malloc(size))) memset(p, 0, size);
|
||||
return p;
|
||||
}
|
||||
|
||||
static void *__asan_realloc(void *p, size_t n) {
|
||||
char *p2;
|
||||
if (p) {
|
||||
if (n) {
|
||||
if ((p2 = __asan_malloc(n))) {
|
||||
memcpy(p2, p, min(n, dlmalloc_usable_size(p)));
|
||||
__asan_deallocate(p, kAsanRelocated);
|
||||
}
|
||||
} else {
|
||||
__asan_free(p);
|
||||
p2 = NULL;
|
||||
}
|
||||
} else {
|
||||
p2 = __asan_malloc(n);
|
||||
}
|
||||
return p2;
|
||||
}
|
||||
|
||||
static void *__asan_valloc(size_t n) {
|
||||
return __asan_memalign(PAGESIZE, n);
|
||||
}
|
||||
|
||||
static void *__asan_pvalloc(size_t n) {
|
||||
return __asan_valloc(ROUNDUP(n, PAGESIZE));
|
||||
}
|
||||
|
||||
static int __asan_malloc_trim(size_t pad) {
|
||||
__asan_morgue_flush();
|
||||
return dlmalloc_trim(pad);
|
||||
}
|
||||
|
||||
void __asan_register_globals(struct AsanGlobal g[], int n) {
|
||||
unsigned i;
|
||||
for (i = 0; i < n; ++i) {
|
||||
__asan_poison_redzone((intptr_t)g[i].addr, g[i].size,
|
||||
g[i].size_with_redzone, kAsanGlobalOverrun);
|
||||
}
|
||||
}
|
||||
|
||||
void __asan_unregister_globals(struct AsanGlobal g[], int n) {
|
||||
unsigned i;
|
||||
intptr_t a, b;
|
||||
for (i = 0; i < n; ++i) {
|
||||
a = ROUNDUP((intptr_t)g[i].addr, 8);
|
||||
b = ROUNDDOWN((intptr_t)g[i].addr + g[i].size_with_redzone, 8);
|
||||
if (b > a) {
|
||||
memset((char *)SHADOW(a), kAsanGlobalUnregistered, (b - a) >> 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void *__asan_stack_malloc(size_t size, int classid) {
|
||||
return __asan_allocate(32, size, kAsanStackUnderrun, kAsanStackOverrun);
|
||||
}
|
||||
|
||||
void __asan_stack_free(char *p, size_t size, int classid) {
|
||||
dlfree(p);
|
||||
}
|
||||
|
||||
void __asan_report_load_n(uint8_t *addr, int size) {
|
||||
__asan_report_memory_fault(addr, size, "load");
|
||||
}
|
||||
|
||||
void __asan_report_store_n(uint8_t *addr, int size) {
|
||||
__asan_report_memory_fault(addr, size, "store");
|
||||
}
|
||||
|
||||
void __asan_poison_stack_memory(uintptr_t p, size_t n) {
|
||||
memset((char *)SHADOW(p), kAsanUnscoped, n >> 3);
|
||||
if (n & 7) *(char *)SHADOW(p + n) = 8 - (n & 7);
|
||||
}
|
||||
|
||||
void __asan_unpoison_stack_memory(uintptr_t p, size_t n) {
|
||||
memset((char *)SHADOW(p), 0, n >> 3);
|
||||
if (n & 7) *(char *)SHADOW(p + n) = n & 7;
|
||||
}
|
||||
|
||||
void __asan_alloca_poison(intptr_t addr, size_t size) {
|
||||
__asan_poison_redzone(addr, size, size + 32, kAsanAllocaOverrun);
|
||||
}
|
||||
|
||||
void __asan_allocas_unpoison(uintptr_t top, uintptr_t bottom) {
|
||||
memset((char *)SHADOW(top), 0, (bottom - top) >> 3);
|
||||
}
|
||||
|
||||
void *__asan_addr_is_in_fake_stack(void *fakestack, void *addr, void **beg,
|
||||
void **end) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void *__asan_get_current_fake_stack(void) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void __asan_install_malloc_hooks(void) {
|
||||
HOOK(hook$free, __asan_free);
|
||||
HOOK(hook$malloc, __asan_malloc);
|
||||
HOOK(hook$calloc, __asan_calloc);
|
||||
HOOK(hook$valloc, __asan_valloc);
|
||||
HOOK(hook$pvalloc, __asan_pvalloc);
|
||||
HOOK(hook$realloc, __asan_realloc);
|
||||
HOOK(hook$memalign, __asan_memalign);
|
||||
HOOK(hook$malloc_trim, __asan_malloc_trim);
|
||||
HOOK(hook$malloc_usable_size, __asan_malloc_usable_size);
|
||||
}
|
||||
|
||||
static bool __asan_is_mapped(int x) {
|
||||
int i = FindMemoryInterval(&_mmi, x);
|
||||
return i < _mmi.i && x >= _mmi.p[i].x && x <= _mmi.p[i].y;
|
||||
}
|
||||
|
||||
void __asan_map_shadow(void *p, size_t n) {
|
||||
int i, x, a, b;
|
||||
struct DirectMap sm;
|
||||
a = SHADOW((uintptr_t)p) >> 16;
|
||||
b = ROUNDUP(SHADOW(ROUNDUP((uintptr_t)p + n, 8)), 1 << 16) >> 16;
|
||||
for (; a < b; ++a) {
|
||||
if (!__asan_is_mapped(a)) {
|
||||
sm = __mmap((void *)((uintptr_t)a << 16), 1 << 16, PROT_READ | PROT_WRITE,
|
||||
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
|
||||
if (sm.addr == MAP_FAILED ||
|
||||
TrackMemoryInterval(&_mmi, a, a, sm.maphandle, PROT_READ | PROT_WRITE,
|
||||
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED) == -1) {
|
||||
abort();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static char *__asan_get_stack_base(void) {
|
||||
uintptr_t rsp;
|
||||
asm("mov\t%%rsp,%0" : "=r"(rsp));
|
||||
return (char *)ROUNDDOWN(ROUNDDOWN(rsp, STACKSIZE), FRAMESIZE);
|
||||
}
|
||||
|
||||
static textstartup size_t __asan_get_auxv_size(intptr_t *auxv) {
|
||||
unsigned i;
|
||||
for (i = 0;; i += 2) {
|
||||
if (!auxv[i]) break;
|
||||
}
|
||||
return (i + 2) * sizeof(intptr_t);
|
||||
}
|
||||
|
||||
static textstartup void __asan_shadow_string_list(char **list) {
|
||||
for (; *list; ++list) {
|
||||
__asan_map_shadow(*list, strlen(*list) + 1);
|
||||
}
|
||||
}
|
||||
|
||||
textstartup void __asan_init(int argc, char **argv, char **envp,
|
||||
intptr_t *auxv) {
|
||||
static bool once;
|
||||
if (once) return;
|
||||
__asan_map_shadow(_base, _end - _base);
|
||||
__asan_map_shadow(__asan_get_stack_base(), STACKSIZE);
|
||||
__asan_shadow_string_list(argv);
|
||||
__asan_shadow_string_list(envp);
|
||||
__asan_map_shadow(auxv, __asan_get_auxv_size(auxv));
|
||||
__asan_install_malloc_hooks();
|
||||
}
|
||||
|
||||
static textstartup void __asan_ctor(void) {
|
||||
__cxa_atexit(__asan_morgue_flush, NULL, NULL);
|
||||
}
|
||||
|
||||
const void *const g_asan_ctor[] initarray = {__asan_ctor};
|
|
@ -1,22 +0,0 @@
|
|||
#ifndef COSMOPOLITAN_LIBC_LOG_ASAN_H_
|
||||
#define COSMOPOLITAN_LIBC_LOG_ASAN_H_
|
||||
|
||||
#define kAsanScale 3
|
||||
#define kAsanMagic 0x7fff8000
|
||||
#define kAsanHeapFree -1
|
||||
#define kAsanStackFree -2
|
||||
#define kAsanRelocated -3
|
||||
#define kAsanHeapUnderrun -4
|
||||
#define kAsanHeapOverrun -5
|
||||
#define kAsanGlobalOverrun -6
|
||||
#define kAsanGlobalUnregistered -7
|
||||
#define kAsanStackUnderrun -8
|
||||
#define kAsanStackOverrun -9
|
||||
#define kAsanAllocaOverrun -10
|
||||
#define kAsanUnscoped -11
|
||||
|
||||
#define SHADOW(x) (((x) >> kAsanScale) + kAsanMagic)
|
||||
|
||||
void __asan_map_shadow(void *, size_t);
|
||||
|
||||
#endif /* COSMOPOLITAN_LIBC_LOG_ASAN_H_ */
|
|
@ -21,10 +21,12 @@
|
|||
#include "libc/bits/safemacros.h"
|
||||
#include "libc/bits/weaken.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/sigbits.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/fmt/conv.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/fmt/itoa.h"
|
||||
#include "libc/log/backtrace.internal.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/nexgen32e/gc.internal.h"
|
||||
|
@ -33,9 +35,10 @@
|
|||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/fileno.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
|
||||
#define kBacktraceMaxFrames 128
|
||||
#define kBacktraceBufSize ((kBacktraceMaxFrames - 1) * (16 + 1))
|
||||
#define kBacktraceBufSize ((kBacktraceMaxFrames - 1) * (18 + 1))
|
||||
|
||||
static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
|
||||
ssize_t got;
|
||||
|
@ -43,7 +46,9 @@ static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
|
|||
size_t i, j, gi;
|
||||
int ws, pid, pipefds[2];
|
||||
struct Garbages *garbage;
|
||||
sigset_t chldmask, savemask;
|
||||
const struct StackFrame *frame;
|
||||
struct sigaction ignore, saveint, savequit;
|
||||
const char *debugbin, *p1, *p2, *p3, *addr2line;
|
||||
char buf[kBacktraceBufSize], *argv[kBacktraceMaxFrames];
|
||||
if (IsOpenbsd()) return -1;
|
||||
|
@ -66,12 +71,25 @@ static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
|
|||
--gi;
|
||||
} while ((addr = garbage->p[gi].ret) == weakaddr("__gc"));
|
||||
}
|
||||
argv[i++] = &buf[j];
|
||||
j += snprintf(&buf[j], 17, "%#x", addr - 1) + 1;
|
||||
argv[i++] = buf + j;
|
||||
buf[j++] = '0';
|
||||
buf[j++] = 'x';
|
||||
j += uint64toarray_radix16(addr - 1, buf + j) + 1;
|
||||
}
|
||||
argv[i++] = NULL;
|
||||
ignore.sa_flags = 0;
|
||||
ignore.sa_handler = SIG_IGN;
|
||||
sigemptyset(&ignore.sa_mask);
|
||||
sigaction(SIGINT, &ignore, &saveint);
|
||||
sigaction(SIGQUIT, &ignore, &savequit);
|
||||
sigemptyset(&chldmask);
|
||||
sigaddset(&chldmask, SIGCHLD);
|
||||
sigprocmask(SIG_BLOCK, &chldmask, &savemask);
|
||||
pipe(pipefds);
|
||||
if (!(pid = vfork())) {
|
||||
sigaction(SIGINT, &saveint, NULL);
|
||||
sigaction(SIGQUIT, &savequit, NULL);
|
||||
sigprocmask(SIG_SETMASK, &savemask, NULL);
|
||||
dup2(pipefds[1], 1);
|
||||
close(pipefds[0]);
|
||||
close(pipefds[1]);
|
||||
|
@ -106,6 +124,9 @@ static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
|
|||
if (errno == EINTR) continue;
|
||||
return -1;
|
||||
}
|
||||
sigaction(SIGINT, &saveint, NULL);
|
||||
sigaction(SIGQUIT, &savequit, NULL);
|
||||
sigprocmask(SIG_SETMASK, &savemask, NULL);
|
||||
if (WIFEXITED(ws) && !WEXITSTATUS(ws)) {
|
||||
return 0;
|
||||
} else {
|
||||
|
|
|
@ -56,10 +56,10 @@ relegated void __check_fail(const char *suffix, const char *opstr,
|
|||
gethostname(hostname, sizeof(hostname));
|
||||
|
||||
(dprintf)(STDERR_FILENO,
|
||||
"check failed on %s pid %d\n"
|
||||
"\tCHECK_%s(%s, %s);\n"
|
||||
"\t\t → %#lx (%s)\n"
|
||||
"\t\t%s %#lx (%s)\n",
|
||||
"check failed on %s pid %d\r\n"
|
||||
"\tCHECK_%s(%s, %s);\r\n"
|
||||
"\t\t → %#lx (%s)\r\n"
|
||||
"\t\t%s %#lx (%s)\r\n",
|
||||
hostname, getpid(), sufbuf, wantstr, gotstr, want, wantstr, opstr,
|
||||
got, gotstr);
|
||||
|
||||
|
@ -68,19 +68,19 @@ relegated void __check_fail(const char *suffix, const char *opstr,
|
|||
va_start(va, fmt);
|
||||
(vdprintf)(STDERR_FILENO, fmt, va);
|
||||
va_end(va);
|
||||
(dprintf)(STDERR_FILENO, "\n");
|
||||
(dprintf)(STDERR_FILENO, "\r\n");
|
||||
}
|
||||
|
||||
(dprintf)(STDERR_FILENO, "\t%s\n\t%s%s%s%s\n", strerror(lasterr), SUBTLE,
|
||||
(dprintf)(STDERR_FILENO, "\t%s\r\n\t%s%s%s%s\r\n", strerror(lasterr), SUBTLE,
|
||||
getauxval(AT_EXECFN), g_argc > 1 ? " \\" : "", RESET);
|
||||
|
||||
for (i = 1; i < g_argc; ++i) {
|
||||
(dprintf)(STDERR_FILENO, "\t\t%s%s\n", g_argv[i],
|
||||
(dprintf)(STDERR_FILENO, "\t\t%s%s\r\n", g_argv[i],
|
||||
i < g_argc - 1 ? " \\" : "");
|
||||
}
|
||||
|
||||
if (!IsTiny() && lasterr == ENOMEM) {
|
||||
(dprintf)(STDERR_FILENO, "\n");
|
||||
(dprintf)(STDERR_FILENO, "\r\n");
|
||||
PrintMemoryIntervals(STDERR_FILENO, &_mmi);
|
||||
}
|
||||
|
||||
|
|
|
@ -46,5 +46,5 @@ relegated void ___check_fail_ndebug(uint64_t want, uint64_t got,
|
|||
__print(bx, uint64toarray_radix16(got, bx));
|
||||
__print_string(" (");
|
||||
__print(bx, int64toarray_radix10(lasterr, bx));
|
||||
__print_string(")\n");
|
||||
__print_string(")\r\n");
|
||||
}
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/bits/bits.h"
|
||||
#include "libc/bits/weaken.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/log/backtrace.internal.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/runtime/internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/sysv/consts/exit.h"
|
||||
#include "libc/sysv/consts/fileno.h"
|
||||
|
||||
/**
|
||||
* Aborts process after printing a backtrace.
|
||||
|
@ -31,15 +31,14 @@
|
|||
*/
|
||||
relegated wontreturn void __die(void) {
|
||||
static bool once;
|
||||
if (!once) {
|
||||
once = true;
|
||||
if (cmpxchg(&once, false, true)) {
|
||||
if (weaken(fflush)) {
|
||||
weaken(fflush)(NULL);
|
||||
}
|
||||
if (!IsTiny()) {
|
||||
if (IsDebuggerPresent(false)) DebugBreak();
|
||||
ShowBacktrace(STDERR_FILENO, NULL);
|
||||
ShowBacktrace(2, NULL);
|
||||
}
|
||||
exit(EXIT_FAILURE);
|
||||
unreachable;
|
||||
}
|
||||
abort();
|
||||
unreachable;
|
||||
_exit(77);
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @returns -1 on error or something else on success
|
||||
*/
|
||||
int getttysize(int fd, struct winsize *out) {
|
||||
if (isterminalinarticulate()) {
|
||||
if (IsTerminalInarticulate()) {
|
||||
out->ws_col = strtoimax(firstnonnull(getenv("COLUMNS"), "80"), NULL, 0);
|
||||
out->ws_row = strtoimax(firstnonnull(getenv("ROWS"), "40"), NULL, 0);
|
||||
out->ws_xpixel = 0;
|
||||
|
|
|
@ -22,4 +22,6 @@
|
|||
/**
|
||||
* Returns true if current process was spawned by GNU Make.
|
||||
*/
|
||||
bool isrunningundermake(void) { return !!getenv("MAKEFLAGS"); }
|
||||
bool IsRunningUnderMake(void) {
|
||||
return !!getenv("MAKEFLAGS");
|
||||
}
|
||||
|
|
|
@ -24,6 +24,6 @@
|
|||
/**
|
||||
* Checks if we're probably running inside Emacs.
|
||||
*/
|
||||
bool isterminalinarticulate(void) {
|
||||
bool IsTerminalInarticulate(void) {
|
||||
return strcmp(nulltoempty(getenv("TERM")), "dumb") == 0;
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ void meminfo(int); /* shows malloc statistics &c. */
|
|||
void memsummary(int); /* light version of same thing */
|
||||
uint16_t getttycols(uint16_t);
|
||||
int getttysize(int, struct winsize *) paramsnonnull();
|
||||
bool isterminalinarticulate(void) nosideeffect;
|
||||
bool IsTerminalInarticulate(void) nosideeffect;
|
||||
char *commandvenv(const char *, const char *) nodiscard;
|
||||
const char *GetAddr2linePath(void);
|
||||
const char *GetGdbPath(void);
|
||||
|
@ -47,7 +47,7 @@ const char *GetGdbPath(void);
|
|||
void showcrashreports(void);
|
||||
void callexitontermination(struct sigset *);
|
||||
bool32 IsDebuggerPresent(bool);
|
||||
bool isrunningundermake(void);
|
||||
bool IsRunningUnderMake(void);
|
||||
|
||||
/*───────────────────────────────────────────────────────────────────────────│─╗
|
||||
│ cosmopolitan § liblog » logging ─╬─│┼
|
||||
|
|
|
@ -58,15 +58,21 @@ $(LIBC_LOG_A).pkg: \
|
|||
$(LIBC_LOG_A_OBJS) \
|
||||
$(foreach x,$(LIBC_LOG_A_DIRECTDEPS),$($(x)_A).pkg)
|
||||
|
||||
$(LIBC_LOG_A_OBJS): \
|
||||
o/$(MODE)/libc/log/attachdebugger.o \
|
||||
o/$(MODE)/libc/log/backtrace2.o \
|
||||
o/$(MODE)/libc/log/backtrace3.o \
|
||||
o/$(MODE)/libc/log/checkaligned.o \
|
||||
o/$(MODE)/libc/log/checkfail.o \
|
||||
o/$(MODE)/libc/log/checkfail_ndebug.o \
|
||||
o/$(MODE)/libc/log/getsymboltable.o \
|
||||
o/$(MODE)/libc/log/oncrash.o \
|
||||
o/$(MODE)/libc/log/onkill.o \
|
||||
o/$(MODE)/libc/log/startfatal.o \
|
||||
o/$(MODE)/libc/log/startfatal_ndebug.o \
|
||||
o/$(MODE)/libc/log/ubsan.o \
|
||||
o/$(MODE)/libc/log/die.o: \
|
||||
OVERRIDE_CFLAGS += \
|
||||
$(NO_MAGIC) \
|
||||
-fwrapv
|
||||
|
||||
# ifeq (,$(MODE))
|
||||
# LIBC_LOG_ASAN = o/$(MODE)/libc/log/asan.o
|
||||
# endif
|
||||
LIBC_LOG_ASAN_A = o/$(MODE)/libc/log/log.a
|
||||
$(NO_MAGIC)
|
||||
|
||||
LIBC_LOG_LIBS = $(foreach x,$(LIBC_LOG_ARTIFACTS),$($(x)))
|
||||
LIBC_LOG_SRCS = $(foreach x,$(LIBC_LOG_ARTIFACTS),$($(x)_SRCS))
|
||||
|
|
|
@ -182,8 +182,9 @@ relegated static void ShowCrashReport(int err, int fd, int sig,
|
|||
write(fd, "\r\n", 2);
|
||||
for (i = 0; i < g_argc; ++i) {
|
||||
write(fd, g_argv[i], strlen(g_argv[i]));
|
||||
write(fd, "\r\n", 2);
|
||||
write(fd, " ", 1);
|
||||
}
|
||||
write(fd, "\r\n", 2);
|
||||
}
|
||||
|
||||
relegated static void RestoreDefaultCrashSignalHandlers(void) {
|
||||
|
@ -221,9 +222,9 @@ relegated void __oncrash(int sig, struct siginfo *si, ucontext_t *ctx) {
|
|||
rip = ctx ? ctx->uc_mcontext.rip : 0;
|
||||
if ((gdbpid = IsDebuggerPresent(true))) {
|
||||
DebugBreak();
|
||||
} else if (isterminalinarticulate() || isrunningundermake()) {
|
||||
} else if (IsTerminalInarticulate() || IsRunningUnderMake()) {
|
||||
gdbpid = -1;
|
||||
} else {
|
||||
} else if (FindDebugBinary()) {
|
||||
RestoreDefaultCrashSignalHandlers();
|
||||
gdbpid =
|
||||
attachdebugger(((sig == SIGTRAP || sig == SIGQUIT) &&
|
||||
|
|
|
@ -1,235 +0,0 @@
|
|||
/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│
|
||||
│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2020 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/macros.h"
|
||||
.privileged
|
||||
.source __FILE__
|
||||
|
||||
/ @fileoverview Address Sanitizer Thunks
|
||||
/
|
||||
/ This has tiny code size and reduces API surface area
|
||||
/ since ASAN has the same stylistic hugeness as UBSAN.
|
||||
/ We also guard all the functions, against reentrancy.
|
||||
|
||||
__asan_report_load1:
|
||||
push $1
|
||||
jmp OnReportLoad
|
||||
.endfn __asan_report_load1,globl
|
||||
__asan_report_load2:
|
||||
push $2
|
||||
jmp OnReportLoad
|
||||
.endfn __asan_report_load2,globl
|
||||
__asan_report_load4:
|
||||
push $4
|
||||
jmp OnReportLoad
|
||||
.endfn __asan_report_load4,globl
|
||||
__asan_report_load8:
|
||||
push $8
|
||||
jmp OnReportLoad
|
||||
.endfn __asan_report_load8,globl
|
||||
__asan_report_load16:
|
||||
push $16
|
||||
/ 𝑠𝑙𝑖𝑑𝑒
|
||||
.endfn __asan_report_load16,globl
|
||||
OnReportLoad:
|
||||
pop %rsi
|
||||
ezlea __asan_report_load_n,ax
|
||||
jmp __asan_report_noreentry
|
||||
.endfn OnReportLoad
|
||||
|
||||
__asan_report_store1:
|
||||
push $1
|
||||
jmp ReportStore
|
||||
.endfn __asan_report_store1,globl
|
||||
__asan_report_store2:
|
||||
push $2
|
||||
jmp ReportStore
|
||||
.endfn __asan_report_store2,globl
|
||||
__asan_report_store4:
|
||||
push $4
|
||||
jmp ReportStore
|
||||
.endfn __asan_report_store4,globl
|
||||
__asan_report_store8:
|
||||
push $8
|
||||
jmp ReportStore
|
||||
.endfn __asan_report_store8,globl
|
||||
__asan_report_store16:
|
||||
push $16
|
||||
jmp ReportStore
|
||||
.endfn __asan_report_store16,globl
|
||||
__asan_report_store32:
|
||||
push $32
|
||||
/ 𝑠𝑙𝑖𝑑𝑒
|
||||
.endfn __asan_report_store32,globl
|
||||
ReportStore:
|
||||
pop %rsi
|
||||
ezlea __asan_report_store_n,ax
|
||||
/ 𝑠𝑙𝑖𝑑𝑒
|
||||
.endfn ReportStore
|
||||
|
||||
__asan_report_noreentry:
|
||||
push %rbp
|
||||
mov %rsp,%rbp
|
||||
cmpb $0,noreentry(%rip)
|
||||
jnz 2f
|
||||
incb noreentry(%rip)
|
||||
call *%rax
|
||||
decb noreentry(%rip)
|
||||
pop %rbp
|
||||
ret
|
||||
2: call abort
|
||||
.endfn __asan_report_noreentry
|
||||
|
||||
__asan_stack_free_0:
|
||||
push $0
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_0,globl
|
||||
__asan_stack_free_1:
|
||||
push $1
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_1,globl
|
||||
__asan_stack_free_2:
|
||||
push $2
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_2,globl
|
||||
__asan_stack_free_3:
|
||||
push $3
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_3,globl
|
||||
__asan_stack_free_4:
|
||||
push $4
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_4,globl
|
||||
__asan_stack_free_5:
|
||||
push $5
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_5,globl
|
||||
__asan_stack_free_6:
|
||||
push $6
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_6,globl
|
||||
__asan_stack_free_7:
|
||||
push $7
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_7,globl
|
||||
__asan_stack_free_8:
|
||||
push $8
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_8,globl
|
||||
__asan_stack_free_9:
|
||||
push $9
|
||||
jmp OnStackFree
|
||||
.endfn __asan_stack_free_9,globl
|
||||
__asan_stack_free_10:
|
||||
push $10
|
||||
/ 𝑠𝑙𝑖𝑑𝑒
|
||||
.endfn __asan_stack_free_10,globl
|
||||
OnStackFree:
|
||||
pop %rdx
|
||||
jmp __asan_stack_free
|
||||
.endfn OnStackFree
|
||||
|
||||
__asan_stack_malloc_0:
|
||||
push $0
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_0,globl
|
||||
__asan_stack_malloc_1:
|
||||
push $1
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_1,globl
|
||||
__asan_stack_malloc_2:
|
||||
push $2
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_2,globl
|
||||
__asan_stack_malloc_3:
|
||||
push $3
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_3,globl
|
||||
__asan_stack_malloc_4:
|
||||
push $4
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_4,globl
|
||||
__asan_stack_malloc_5:
|
||||
push $5
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_5,globl
|
||||
__asan_stack_malloc_6:
|
||||
push $6
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_6,globl
|
||||
__asan_stack_malloc_7:
|
||||
push $7
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_7,globl
|
||||
__asan_stack_malloc_8:
|
||||
push $8
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_8,globl
|
||||
__asan_stack_malloc_9:
|
||||
push $9
|
||||
jmp OnStackMalloc
|
||||
.endfn __asan_stack_malloc_9,globl
|
||||
__asan_stack_malloc_10:
|
||||
push $10
|
||||
/ 𝑠𝑙𝑖𝑑𝑒
|
||||
.endfn __asan_stack_malloc_10,globl
|
||||
OnStackMalloc:
|
||||
pop %rsi
|
||||
jmp __asan_stack_malloc
|
||||
.endfn OnStackMalloc
|
||||
|
||||
__asan_handle_no_return:
|
||||
ret
|
||||
.endfn __asan_handle_no_return,globl
|
||||
|
||||
__asan_before_dynamic_init:
|
||||
ret
|
||||
.endfn __asan_before_dynamic_init,globl
|
||||
|
||||
__asan_after_dynamic_init:
|
||||
ret
|
||||
.endfn __asan_after_dynamic_init,globl
|
||||
|
||||
__asan_version_mismatch_check_v8:
|
||||
ret
|
||||
.endfn __asan_version_mismatch_check_v8,globl
|
||||
|
||||
/ Initializes Address Sanitizer runtime earlier if linked.
|
||||
.init.start 301,_init_asan
|
||||
push %rdi
|
||||
push %rsi
|
||||
mov %r12,%rdi
|
||||
mov %r13,%rsi
|
||||
mov %r14,%rdx
|
||||
mov %r15,%rcx
|
||||
call __asan_init
|
||||
pop %rsi
|
||||
pop %rdi
|
||||
.init.end 301,_init_asan
|
||||
|
||||
.rodata.cst4
|
||||
__asan_option_detect_stack_use_after_return:
|
||||
.long 0
|
||||
.endobj __asan_option_detect_stack_use_after_return,globl
|
||||
.previous
|
||||
|
||||
.bss
|
||||
noreentry:
|
||||
.byte 0
|
||||
.endobj noreentry
|
||||
.previous
|
Loading…
Add table
Add a link
Reference in a new issue