From b4b1e10364c8737a632be61582e05a8d3acf5690 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 19 Apr 2018 22:19:29 -0400 Subject: reintroduce hardening against partially-replaced allocator commit 618b18c78e33acfe54a4434e91aa57b8e171df89 removed the previous detection and hardening since it was incorrect. commit 72141795d4edd17f88da192447395a48444afa10 already handled all that remained for hardening the static-linked case. in the dynamic-linked case, have the dynamic linker check whether malloc was replaced and make that information available. with these changes, the properties documented in commit c9f415d7ea2dace5bf77f6518b6afc36bb7a5732 are restored: if calloc is not provided, it will behave as malloc+memset, and any of the memalign-family functions not provided will fail with ENOMEM. --- src/malloc/memalign.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/malloc/memalign.c') diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c index 7246a99b..8a6152f4 100644 --- a/src/malloc/memalign.c +++ b/src/malloc/memalign.c @@ -13,7 +13,7 @@ void *__memalign(size_t align, size_t len) return 0; } - if (len > SIZE_MAX - align) { + if (len > SIZE_MAX - align || __malloc_replaced) { errno = ENOMEM; return 0; } -- cgit v1.2.1