diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-05-24 08:05:15 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-05-24 08:05:15 +0200 |
| commit | dea39b13e2958a7f0e75b5594a06d97d61cc439f (patch) | |
| tree | 09260fd3d3ac770d9f4ee34ce02d070b1688b4cd /malloc/hooks.c | |
| parent | db1fa6b8d32a0c7155dcaed2f5f9388511613595 (diff) | |
| download | glibc-dea39b13e2958a7f0e75b5594a06d97d61cc439f.zip glibc-dea39b13e2958a7f0e75b5594a06d97d61cc439f.tar.gz glibc-dea39b13e2958a7f0e75b5594a06d97d61cc439f.tar.bz2 | |
malloc: Correct malloc alignment on 32-bit architectures [BZ #6527]
After the heap rewriting added in commit
4cf6c72fd2a482e7499c29162349810029632c3f (malloc: Rewrite dumped heap
for compatibility in __malloc_set_state), we can change malloc alignment
for new allocations because the alignment of old allocations no longer
matters.
We need to increase the malloc state version number, so that binaries
containing dumped heaps of the new layout will not try to run on
previous versions of glibc, resulting in obscure crashes.
This commit addresses a failure of tst-malloc-thread-fail on the
affected architectures (32-bit ppc and mips) because the test checks
pointer alignment.
Diffstat (limited to 'malloc/hooks.c')
| -rw-r--r-- | malloc/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/hooks.c b/malloc/hooks.c index 45241f2..caa1e70 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -465,7 +465,7 @@ memalign_check (size_t alignment, size_t bytes, const void *caller) then the hooks are reset to 0. */ #define MALLOC_STATE_MAGIC 0x444c4541l -#define MALLOC_STATE_VERSION (0 * 0x100l + 4l) /* major*0x100 + minor */ +#define MALLOC_STATE_VERSION (0 * 0x100l + 5l) /* major*0x100 + minor */ struct malloc_save_state { |