diff options
| -rw-r--r-- | include/mapalloc.h | 15 | ||||
| -rw-r--r-- | src/mapalloc.c | 48 | ||||
| -rw-r--r-- | src/wrap.c | 8 | ||||
| -rw-r--r-- | test/double-free.c | 6 | ||||
| -rw-r--r-- | test/overflow.c | 2 | ||||
| -rw-r--r-- | test/realloc.c | 6 | ||||
| -rw-r--r-- | test/underflow.c | 2 | ||||
| -rw-r--r-- | test/use-after-free.c | 4 | ||||
| -rw-r--r-- | test/zero.c | 2 |
9 files changed, 50 insertions, 43 deletions
diff --git a/include/mapalloc.h b/include/mapalloc.h index f4a4434..65581c8 100644 --- a/include/mapalloc.h +++ b/include/mapalloc.h @@ -3,9 +3,16 @@ #include <stddef.h> /* for the definition of size_t */ -void *map_malloc(size_t n); -void *map_calloc(size_t nelem, size_t elsize); -void *map_realloc(void *ptr, size_t n); -void map_free(void *ptr); +void *MA_malloc(size_t n); +void *MA_calloc(size_t nelem, size_t elsize); +void *MA_realloc(void *ptr, size_t n); +void MA_free(void *ptr); + +#ifdef MA_OVERRIDE_STDLIB +#define malloc(n) MA_malloc(n) +#define calloc(n, e) MA_calloc(n, e) +#define realloc(p, n) MA_realloc(p, n) +#define free(p) MA_free(p) +#endif #endif diff --git a/src/mapalloc.c b/src/mapalloc.c index 95f63bf..a213bfb 100644 --- a/src/mapalloc.c +++ b/src/mapalloc.c @@ -12,8 +12,8 @@ #include "mapalloc.h" #ifndef PAGESIZE -#define PAGESIZE get_pagesize() -static size_t get_pagesize(void) +#define PAGESIZE MA_pagesize() +static size_t MA_pagesize(void) { static size_t pagesize = 0; if (pagesize == 0) { @@ -25,12 +25,12 @@ static size_t get_pagesize(void) #define MAPALLOC_EXIT_VALUE (127 + SIGSEGV) -struct bucket { +struct MA_bucket { size_t used; size_t allocated; }; -static void *page_alloc(size_t npages) +static void *MA_page_alloc(size_t npages) { int fd = -1; int prot = PROT_READ | PROT_WRITE; @@ -51,35 +51,35 @@ static void *page_alloc(size_t npages) return pages; } -static void map_signal_action(int sig, siginfo_t *si, void *addr) +static void MA_sigaction(int sig, siginfo_t *si, void *addr) { (void)sig; (void)addr; fprintf(stderr, "error accessing %p\n", si->si_addr); _exit(MAPALLOC_EXIT_VALUE); } -static void set_signal_handler(void) +static void MA_set_sigaction(void) { struct sigaction sa = { .sa_flags = SA_SIGINFO, - .sa_sigaction = map_signal_action, + .sa_sigaction = MA_sigaction, }; sigemptyset(&sa.sa_mask); sigaction(SIGSEGV, &sa, NULL); } -static struct bucket *get_bucket(void *ptr, int allocate) +static struct MA_bucket *MA_bucket(void *ptr, int allocate) { /* FIXME: assumption that one page can hold UCHAR_MAX uintptr_t */ /* FIXME: check return values of page_alloc() */ static uintptr_t *trie_top = NULL; if (trie_top == NULL) { - trie_top = page_alloc(1); + trie_top = MA_page_alloc(1); memset(trie_top, 0, PAGESIZE); } - set_signal_handler(); + MA_set_sigaction(); uintptr_t *trie = trie_top; uintptr_t addr = (uintptr_t)ptr; @@ -89,7 +89,7 @@ static struct bucket *get_bucket(void *ptr, int allocate) if (trie[next] == 0) { if (allocate) { - uintptr_t *newtrie = page_alloc(1); + uintptr_t *newtrie = MA_page_alloc(1); memset(newtrie, 0, PAGESIZE); trie[next] = (uintptr_t) newtrie; } else { @@ -98,29 +98,29 @@ static struct bucket *get_bucket(void *ptr, int allocate) } trie = (uintptr_t*)trie[next]; } - return trie ? (struct bucket *)trie : NULL; + return trie ? (struct MA_bucket *)trie : NULL; } -void *map_calloc(size_t nelem, size_t elsize) +void *MA_calloc(size_t nelem, size_t elsize) { size_t n = nelem * elsize; if (n < nelem || n < elsize) { /* overflow */ return NULL; } - void *ptr = map_malloc(n); + void *ptr = MA_malloc(n); memset(ptr, 0, n); return ptr; } -void *map_malloc(size_t nbytes) +void *MA_malloc(size_t nbytes) { size_t pages = 2 + (nbytes / PAGESIZE); if (nbytes % PAGESIZE != 0) { pages++; } - char *ptr = page_alloc(pages); + char *ptr = MA_page_alloc(pages); if (ptr == MAP_FAILED) { return NULL; } @@ -128,20 +128,20 @@ void *map_malloc(size_t nbytes) mprotect(ptr, PAGESIZE, PROT_NONE); mprotect(ptr + ((pages - 1) * PAGESIZE), PAGESIZE, PROT_NONE); - struct bucket *b = get_bucket(ptr + PAGESIZE, 1); + struct MA_bucket *b = MA_bucket(ptr + PAGESIZE, 1); b->used = nbytes; b->allocated = pages * PAGESIZE; return ptr + PAGESIZE; } -void *map_realloc(void *ptr, size_t n) +void *MA_realloc(void *ptr, size_t n) { if (ptr == NULL) { - return map_malloc(n); + return MA_malloc(n); } - struct bucket *b = get_bucket(ptr, 0); + struct MA_bucket *b = MA_bucket(ptr, 0); if (b == NULL) { fprintf(stderr, "%s(%p, %zu): invalid pointer\n", __func__, ptr, n); _exit(MAPALLOC_EXIT_VALUE); @@ -153,21 +153,21 @@ void *map_realloc(void *ptr, size_t n) return ptr; } - void *newptr = map_malloc(n); + void *newptr = MA_malloc(n); if (newptr != NULL) { memcpy(newptr, ptr, b->used); - map_free(ptr); + MA_free(ptr); } return newptr; } -void map_free(void *ptr) +void MA_free(void *ptr) { if (ptr == NULL) { return; } - struct bucket *b = get_bucket(ptr, 0); + struct MA_bucket *b = MA_bucket(ptr, 0); if (b == NULL) { fprintf(stderr, "%s(%p): invalid pointer\n", __func__, ptr); _exit(MAPALLOC_EXIT_VALUE); @@ -2,20 +2,20 @@ void *malloc(size_t n) { - return map_malloc(n); + return MA_malloc(n); } void *calloc(size_t n, size_t e) { - return map_calloc(n, e); + return MA_calloc(n, e); } void *realloc(void *p, size_t n) { - return map_realloc(p, n); + return MA_realloc(p, n); } void free(void *p) { - map_free(p); + MA_free(p); } diff --git a/test/double-free.c b/test/double-free.c index 73ceff5..6771dee 100644 --- a/test/double-free.c +++ b/test/double-free.c @@ -8,12 +8,12 @@ int main(void) { const char buf[] = "THIS IS A CONSTANT STRING"; - char *ptr = map_malloc(sizeof(buf)); + char *ptr = MA_malloc(sizeof(buf)); memcpy(ptr, buf, sizeof(buf)); printf("%p: %s\n", ptr, ptr); - map_free(ptr); + MA_free(ptr); printf("freed\n"); - map_free(ptr); + MA_free(ptr); printf("freed again\n"); } diff --git a/test/overflow.c b/test/overflow.c index 8bb1681..67da24a 100644 --- a/test/overflow.c +++ b/test/overflow.c @@ -5,7 +5,7 @@ int main(void) { - char *ptr = map_malloc(1); + char *ptr = MA_malloc(1); long pagesize = sysconf(_SC_PAGESIZE); printf("ptr: %p, pagesize %ld\n", ptr, pagesize); ptr[pagesize] = '\0'; diff --git a/test/realloc.c b/test/realloc.c index 8106b1f..f7b33ff 100644 --- a/test/realloc.c +++ b/test/realloc.c @@ -8,15 +8,15 @@ int main(void) { const char buf[] = "THIS IS A CONSTANT STRING"; - char *ptr = map_realloc(NULL, sizeof(buf)); + char *ptr = MA_realloc(NULL, sizeof(buf)); memcpy(ptr, buf, sizeof(buf)); printf("%p: %s\n", ptr, ptr); - ptr = map_realloc(ptr, sizeof(buf) * 2); + ptr = MA_realloc(ptr, sizeof(buf) * 2); memcpy(ptr + sizeof(buf) - 1, buf, sizeof(buf)); printf("%p: %s\n", ptr, ptr); - ptr = map_realloc(ptr, sizeof(buf) * sysconf(_SC_PAGESIZE)); + ptr = MA_realloc(ptr, sizeof(buf) * sysconf(_SC_PAGESIZE)); memcpy(ptr + (2 * sizeof(buf)) - 2, buf, sizeof(buf)); printf("%p: %s\n", ptr, ptr); } diff --git a/test/underflow.c b/test/underflow.c index f23aa6d..e8cadf5 100644 --- a/test/underflow.c +++ b/test/underflow.c @@ -5,7 +5,7 @@ int main(void) { - char *ptr = map_malloc(1); + char *ptr = MA_malloc(1); long pagesize = sysconf(_SC_PAGESIZE); printf("ptr: %p, pagesize %ld\n", ptr, pagesize); ptr[-1] = '\0'; diff --git a/test/use-after-free.c b/test/use-after-free.c index 4338ed5..c7ae9cb 100644 --- a/test/use-after-free.c +++ b/test/use-after-free.c @@ -8,11 +8,11 @@ int main(void) { const char buf[] = "THIS IS A CONSTANT STRING"; - char *ptr = map_malloc(sizeof(buf)); + char *ptr = MA_malloc(sizeof(buf)); memcpy(ptr, buf, sizeof(buf)); printf("%p: %s\n", ptr, ptr); - map_free(ptr); + MA_free(ptr); printf("freed\n"); printf("%p: %s\n", ptr, ptr); } diff --git a/test/zero.c b/test/zero.c index 7be3ad2..15c0890 100644 --- a/test/zero.c +++ b/test/zero.c @@ -5,7 +5,7 @@ int main(void) { - char *ptr = map_malloc(0); + char *ptr = MA_malloc(0); long pagesize = sysconf(_SC_PAGESIZE); printf("ptr: %p, pagesize %ld\n", ptr, pagesize); ptr[0] = '\0'; |