malloc: Fix issue with calloc memory possibly being non-zero
PATCH v2 1/1 malloc: Fix issue with calloc memory possibly being non-zero
Since we set #define MORECORE_CLEARS 1, the code assumes 'sbrk' always returns zero'd out memory. However since its possible that free() returns memory back to sbrk() via malloc_trim we could possible get non-zero'd memory from sbrk(). This is a problem for when code might call calloc() and expect the memory to have been zero'd out.
There are two possible solutions to this problem.
1. change #define MORECORE_CLEARS 0
2. memset to zero memory returned to sbrk.
We go with the second since the sbrk being called to free up memory should be pretty rare.
The following code problems an example test to show the issue. This test code was inserted right after the call to mem_malloc_init().
...
u8 *p2;
int i;
printf("MALLOC TEST\n");
p1 = malloc(135176);
printf("P1 = %p\n", p1);
memset(p1, 0xab, 135176);
free(p1);
p2 = calloc(4097, 1);
printf("P2 = %p %p\n", p2, p2 + 4097);
for (i = 0; i < 4097; i++) {
if (p2[i] != 0)
printf("miscompare at byte %d got %x\n", i, p2[i]);
free(p2);
printf("END MALLOC TEST\n\n");...
---
* Fix commit message screw up
common/dlmalloc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
common/dlmalloc.c +7 -0
@@ -1511,6 +1511,13 @@ void *sbrk(ptrdiff_t increment)ulong old = mem_malloc_brk;ulong new = old + increment; +/* +* if we are giving memory back make sure we clear it out since +* we set MORECORE_CLEARS to 1 +*/ +if (increment <0 ) +memset ((void *)new,0 , -increment); +if ((new < mem_malloc_start) || (new > mem_malloc_end))return (void *)MORECORE_FAILURE ;
Signature · 1 line
1.7.2.3
Wolfgang Denk
AppliedPATCH v2 1/1 malloc: Fix issue with calloc memory possibly being non-zero
Dear Kumar Gala,
Quoted 37 lines · In message <[email protected]> you…
Since we set #define
MORECORE_CLEARS1, the code assumes 'sbrk' always returns zero'd out memory. However since its possible thatfree()returns memory back tosbrk()viamalloc_trimwe could possible get non-zero'd memory fromsbrk(). This is a problem for when code might callcalloc()and expect the memory to have been zero'd out.There are two possible solutions to this problem.
1. change #defineMORECORE_CLEARS0
2. memset to zero memory returned to sbrk.We go with the second since the sbrk being called to free up memory should be pretty rare.
The following code problems an example test to show the issue. This test code was inserted right after the call to
mem_malloc_init()....
u8 *p2; int i; printf("MALLOC TEST\n"); p1 = malloc(135176); printf("P1 = %p\n", p1); memset(p1, 0xab, 135176); free(p1); p2 = calloc(4097, 1); printf("P2 = %p %p\n", p2, p2 + 4097); for (i = 0; i < 4097; i++) { if (p2[i] != 0) printf("miscompare at byte %d got %x\n", i, p2[i]); free(p2); printf("END MALLOC TEST\n\n");...
Quoted 7 lines
Signed-off-by Kumar Gala <[email protected]>Tested-by Wolfgang Denk <[email protected]>---
* Fix commit message screw upcommon/dlmalloc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Memories of you remind me of you. - Karl Lehenbauer