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/internal/malloc_impl.h | |
| parent | 72141795d4edd17f88da192447395a48444afa10 (diff) | |
| download | musl-b4b1e10364c8737a632be61582e05a8d3acf5690.tar.gz | |
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/internal/malloc_impl.h')
| -rw-r--r-- | src/internal/malloc_impl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/internal/malloc_impl.h b/src/internal/malloc_impl.h index 4c4a4b46..5d025b06 100644 --- a/src/internal/malloc_impl.h +++ b/src/internal/malloc_impl.h @@ -39,4 +39,7 @@ struct bin { __attribute__((__visibility__("hidden"))) void __bin_chunk(struct chunk *); +__attribute__((__visibility__("hidden"))) +extern int __malloc_replaced; + #endif |