code format qasan

This commit is contained in:
van Hauser
2021-02-01 23:00:45 +01:00
parent 90fdafa1ad
commit cd95ee67bc
6 changed files with 3028 additions and 2056 deletions

View File

@ -50,9 +50,9 @@ typedef struct {
struct chunk_begin {
size_t requested_size;
void* aligned_orig; // NULL if not aligned
struct chunk_begin* next;
struct chunk_begin* prev;
void * aligned_orig; // NULL if not aligned
struct chunk_begin *next;
struct chunk_begin *prev;
char redzone[REDZONE_SIZE];
};
@ -66,29 +66,29 @@ struct chunk_struct {
};
// From dlmalloc.c
void* dlmalloc(size_t);
void dlfree(void*);
void *dlmalloc(size_t);
void dlfree(void *);
int __libqasan_malloc_initialized;
static struct chunk_begin* quarantine_top;
static struct chunk_begin* quarantine_end;
static struct chunk_begin *quarantine_top;
static struct chunk_begin *quarantine_end;
static size_t quarantine_bytes;
#ifdef __BIONIC__
static pthread_mutex_t quarantine_lock;
#define LOCK_TRY pthread_mutex_trylock
#define LOCK_INIT pthread_mutex_init
#define LOCK_UNLOCK pthread_mutex_unlock
static pthread_mutex_t quarantine_lock;
#define LOCK_TRY pthread_mutex_trylock
#define LOCK_INIT pthread_mutex_init
#define LOCK_UNLOCK pthread_mutex_unlock
#else
static pthread_spinlock_t quarantine_lock;
#define LOCK_TRY pthread_spin_trylock
#define LOCK_INIT pthread_spin_init
#define LOCK_UNLOCK pthread_spin_unlock
static pthread_spinlock_t quarantine_lock;
#define LOCK_TRY pthread_spin_trylock
#define LOCK_INIT pthread_spin_init
#define LOCK_UNLOCK pthread_spin_unlock
#endif
// need qasan disabled
static int quanratine_push(struct chunk_begin* ck) {
static int quanratine_push(struct chunk_begin *ck) {
if (ck->requested_size >= QUARANTINE_MAX_BYTES) return 0;
@ -96,7 +96,7 @@ static int quanratine_push(struct chunk_begin* ck) {
while (ck->requested_size + quarantine_bytes >= QUARANTINE_MAX_BYTES) {
struct chunk_begin* tmp = quarantine_end;
struct chunk_begin *tmp = quarantine_end;
quarantine_end = tmp->prev;
quarantine_bytes -= tmp->requested_size;
@ -131,29 +131,24 @@ void __libqasan_init_malloc(void) {
}
size_t __libqasan_malloc_usable_size(void* ptr) {
size_t __libqasan_malloc_usable_size(void *ptr) {
char* p = ptr;
char *p = ptr;
p -= sizeof(struct chunk_begin);
return ((struct chunk_begin*)p)->requested_size;
return ((struct chunk_begin *)p)->requested_size;
}
void* __libqasan_malloc(size_t size) {
void *__libqasan_malloc(size_t size) {
if (!__libqasan_malloc_initialized) {
__libqasan_init_malloc();
if (!__libqasan_malloc_initialized) { __libqasan_init_malloc(); }
}
if (!__libqasan_malloc_initialized)
__libqasan_init_malloc();
if (!__libqasan_malloc_initialized) __libqasan_init_malloc();
int state = QASAN_SWAP(QASAN_DISABLED); // disable qasan for this thread
struct chunk_begin* p = dlmalloc(sizeof(struct chunk_struct) + size);
struct chunk_begin *p = dlmalloc(sizeof(struct chunk_struct) + size);
QASAN_SWAP(state);
@ -165,14 +160,14 @@ void* __libqasan_malloc(size_t size) {
p->aligned_orig = NULL;
p->next = p->prev = NULL;
QASAN_ALLOC(&p[1], (char*)&p[1] + size);
QASAN_ALLOC(&p[1], (char *)&p[1] + size);
QASAN_POISON(p->redzone, REDZONE_SIZE, ASAN_HEAP_LEFT_RZ);
if (size & (ALLOC_ALIGN_SIZE - 1))
QASAN_POISON((char*)&p[1] + size,
QASAN_POISON((char *)&p[1] + size,
(size & ~(ALLOC_ALIGN_SIZE - 1)) + 8 - size + REDZONE_SIZE,
ASAN_HEAP_RIGHT_RZ);
else
QASAN_POISON((char*)&p[1] + size, REDZONE_SIZE, ASAN_HEAP_RIGHT_RZ);
QASAN_POISON((char *)&p[1] + size, REDZONE_SIZE, ASAN_HEAP_RIGHT_RZ);
__builtin_memset(&p[1], 0xff, size);
@ -180,11 +175,11 @@ void* __libqasan_malloc(size_t size) {
}
void __libqasan_free(void* ptr) {
void __libqasan_free(void *ptr) {
if (!ptr) return;
struct chunk_begin* p = ptr;
struct chunk_begin *p = ptr;
p -= 1;
size_t n = p->requested_size;
@ -211,11 +206,11 @@ void __libqasan_free(void* ptr) {
}
void* __libqasan_calloc(size_t nmemb, size_t size) {
void *__libqasan_calloc(size_t nmemb, size_t size) {
size *= nmemb;
char* p = __libqasan_malloc(size);
char *p = __libqasan_malloc(size);
if (!p) return NULL;
__builtin_memset(p, 0, size);
@ -224,14 +219,14 @@ void* __libqasan_calloc(size_t nmemb, size_t size) {
}
void* __libqasan_realloc(void* ptr, size_t size) {
void *__libqasan_realloc(void *ptr, size_t size) {
char* p = __libqasan_malloc(size);
char *p = __libqasan_malloc(size);
if (!p) return NULL;
if (!ptr) return p;
size_t n = ((struct chunk_begin*)ptr)[-1].requested_size;
size_t n = ((struct chunk_begin *)ptr)[-1].requested_size;
if (size < n) n = size;
__builtin_memcpy(p, ptr, n);
@ -241,9 +236,9 @@ void* __libqasan_realloc(void* ptr, size_t size) {
}
int __libqasan_posix_memalign(void** ptr, size_t align, size_t len) {
int __libqasan_posix_memalign(void **ptr, size_t align, size_t len) {
if ((align % 2) || (align % sizeof(void*))) return EINVAL;
if ((align % 2) || (align % sizeof(void *))) return EINVAL;
if (len == 0) {
*ptr = NULL;
@ -257,7 +252,7 @@ int __libqasan_posix_memalign(void** ptr, size_t align, size_t len) {
int state = QASAN_SWAP(QASAN_DISABLED); // disable qasan for this thread
char* orig = dlmalloc(sizeof(struct chunk_struct) + size);
char *orig = dlmalloc(sizeof(struct chunk_struct) + size);
QASAN_SWAP(state);
@ -265,10 +260,10 @@ int __libqasan_posix_memalign(void** ptr, size_t align, size_t len) {
QASAN_UNPOISON(orig, sizeof(struct chunk_struct) + size);
char* data = orig + sizeof(struct chunk_begin);
char *data = orig + sizeof(struct chunk_begin);
data += align - ((uintptr_t)data % align);
struct chunk_begin* p = (struct chunk_begin*)data - 1;
struct chunk_begin *p = (struct chunk_begin *)data - 1;
p->requested_size = len;
p->aligned_orig = orig;
@ -291,9 +286,9 @@ int __libqasan_posix_memalign(void** ptr, size_t align, size_t len) {
}
void* __libqasan_memalign(size_t align, size_t len) {
void *__libqasan_memalign(size_t align, size_t len) {
void* ret = NULL;
void *ret = NULL;
__libqasan_posix_memalign(&ret, align, len);
@ -301,9 +296,9 @@ void* __libqasan_memalign(size_t align, size_t len) {
}
void* __libqasan_aligned_alloc(size_t align, size_t len) {
void *__libqasan_aligned_alloc(size_t align, size_t len) {
void* ret = NULL;
void *ret = NULL;
if ((len % align)) return NULL;