diff --git a/doc/zzuf.1 b/doc/zzuf.1 index f04b18f..6e8e289 100644 --- a/doc/zzuf.1 +++ b/doc/zzuf.1 @@ -290,8 +290,7 @@ Standard IO streams: .TP Memory management: \fBmmap\fR(), \fBmunmap\fR(), \fBmalloc\fR(), \fBcalloc\fR(), \fBvalloc\fR(), -\fBfree\fR(), \fBmemalign\fR(), \fBposix_memalign\fR(), \fBbrk\fR(), -\fBsbrk\fR() +\fBfree\fR(), \fBmemalign\fR(), \fBposix_memalign\fR() .TP Linux-specific: \fBopen64\fR(), \fBlseek64\fR(), \fBmmap64\fR(), \fB_IO_getc\fR(), diff --git a/src/load-mem.c b/src/load-mem.c index ac82664..757ec70 100644 --- a/src/load-mem.c +++ b/src/load-mem.c @@ -53,6 +53,8 @@ #include "load.h" #include "fd.h" +/* TODO: mremap, maybe brk/sbrk */ + /* Library functions that we divert */ static void * (*calloc_orig) (size_t nmemb, size_t size); static void * (*malloc_orig) (size_t size); @@ -66,14 +68,9 @@ static int (*posix_memalign_orig) (void **memptr, size_t alignment, size_t size); #endif static void * (*realloc_orig) (void *ptr, size_t size); -static int (*brk_orig) (void *end_data_segment); -static void * (*sbrk_orig) (intptr_t increment); static void * (*mmap_orig) (void *start, size_t length, int prot, int flags, int fd, off_t offset); -/* TODO */ -/* static void * (*mremap_orig) (void *old_address, size_t old_size, - size_t new_size, int flags); */ #ifdef HAVE_MMAP64 static void * (*mmap64_orig) (void *start, size_t length, int prot, int flags, int fd, off64_t offset); @@ -98,8 +95,6 @@ void _zz_load_mem(void) #ifdef HAVE_POSIX_MEMALIGN LOADSYM(posix_memalign); #endif - LOADSYM(brk); - LOADSYM(sbrk); LOADSYM(mmap); #ifdef HAVE_MMAP64 @@ -202,28 +197,6 @@ int posix_memalign(void **memptr, size_t alignment, size_t size) } #endif -int brk(void *end_data_segment) -{ - int ret; - if(!_zz_ready) - LOADSYM(brk); - ret = brk_orig(end_data_segment); - if(ret == -1 && _zz_memory && errno == ENOMEM) - raise(SIGKILL); - return ret; -} - -void *sbrk(intptr_t increment) -{ - void *ret; - if(!_zz_ready) - LOADSYM(sbrk); - ret = sbrk_orig(increment); - if(ret == (void *)-1 && _zz_memory && errno == ENOMEM) - raise(SIGKILL); - return ret; -} - /* Table used for mmap() and munmap() */ void **maps = NULL; int nbmaps = 0;