summaryrefslogtreecommitdiffstats
path: root/common/tlsf_malloc.c
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-10-15 10:00:17 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-10-16 09:04:08 +0200
commitd83ae9c923b2b271ffd2a86279dad91c7713146d (patch)
tree93ddf56cfc91ceb40d452165c3cd9e09e0dec7f0 /common/tlsf_malloc.c
parent2c76867dce40761575f9f3e5cbf7d49e03af3de5 (diff)
downloadbarebox-d83ae9c923b2b271ffd2a86279dad91c7713146d.tar.gz
tlsf_malloc: dummy_malloc: Share code for calloc()
Calloc() implementation for TLSF does not correctly check for malloc() failure which can result in a NULL pointer exception when trying to calloc() extra large buffers. Since both TLSF and dummy malloc implementations of calloc() are exactly the same, pick implementation for the latter (which does aforementioned check) and share it between the two. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/tlsf_malloc.c')
-rw-r--r--common/tlsf_malloc.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/common/tlsf_malloc.c b/common/tlsf_malloc.c
index a3541d8..aa3ab23 100644
--- a/common/tlsf_malloc.c
+++ b/common/tlsf_malloc.c
@@ -39,22 +39,6 @@ void *malloc(size_t bytes)
}
EXPORT_SYMBOL(malloc);
-/*
- * calloc calls malloc, then zeroes out the allocated chunk.
- */
-void *calloc(size_t n, size_t elem_size)
-{
- void *mem;
- size_t sz;
-
- sz = n * elem_size;
- mem = malloc(sz);
- memset(mem, 0, sz);
-
- return mem;
-}
-EXPORT_SYMBOL(calloc);
-
void free(void *mem)
{
tlsf_free(tlsf_mem_pool, mem);