diff options
| author | Rich Felker <dalias@aerifal.cx> | 2018-04-19 22:19:29 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-04-19 22:22:11 -0400 |
| commit | b4b1e10364c8737a632be61582e05a8d3acf5690 (patch) | |
| tree | 68c07893e646a5e94c47afb7f8b01317c143968b /src/malloc/memalign.c | |
| parent | 72141795d4edd17f88da192447395a48444afa10 (diff) | |
| download | musl-b4b1e10364c8737a632be61582e05a8d3acf5690.tar.gz musl-b4b1e10364c8737a632be61582e05a8d3acf5690.tar.xz musl-b4b1e10364c8737a632be61582e05a8d3acf5690.zip | |
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.
Diffstat (limited to 'src/malloc/memalign.c')
| -rw-r--r-- | src/malloc/memalign.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |