path: root/src/malloc/memalign.c
diff options
authorRich Felker <>2018-04-19 15:25:48 -0400
committerRich Felker <>2018-04-19 15:25:48 -0400
commit618b18c78e33acfe54a4434e91aa57b8e171df89 (patch)
tree8d708c55f836ba396dab5b49312f8242d61d7ed9 /src/malloc/memalign.c
parent3f3cc3e99558501318e2f16ff03bbd68ce5a5e95 (diff)
revert detection of partially-replaced allocator
commit c9f415d7ea2dace5bf77f6518b6afc36bb7a5732 included checks to make calloc fallback to memset if used with a replaced malloc that didn't also replace calloc, and the memalign family fail if free has been replaced. however, the checks gave false positives for replacement whenever malloc or free resolved to a PLT entry in the main program. for now, disable the checks so as not to leave libc in a broken state. this means that the properties documented in the above commit are no longer satisfied; failure to replace calloc and the memalign family along with malloc is unsafe if they are ever called. the calloc checks were correct but useless for static linking. in both cases (simple or full malloc), calloc and malloc are in a source file together, so replacement of one but not the other would give linking errors. the memalign-family check was useful for static linking, but broken for dynamic as described above, and can be replaced with a better link-time check.
Diffstat (limited to 'src/malloc/memalign.c')
1 files changed, 1 insertions, 3 deletions
diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c
index 35b67599..8fb2002c 100644
--- a/src/malloc/memalign.c
+++ b/src/malloc/memalign.c
@@ -3,8 +3,6 @@
#include <errno.h>
#include "libc.h"
-void __internal_free(void *);
void *__memalign(size_t align, size_t len)
unsigned char *mem, *new, *end;
@@ -15,7 +13,7 @@ void *__memalign(size_t align, size_t len)
return NULL;
- if (len > SIZE_MAX - align || free != __internal_free) {
+ if (len > SIZE_MAX - align) {
errno = ENOMEM;
return NULL;