diff --git a/common/tlsf_malloc.c b/common/tlsf_malloc.c
index 2fe443b..8143d66 100644
--- a/common/tlsf_malloc.c
+++ b/common/tlsf_malloc.c
@@ -33,6 +33,13 @@
 
 void *malloc(size_t bytes)
 {
+	/*
+	 * tlsf_malloc returns NULL for zero bytes, we instead want
+	 * to have a valid pointer.
+	 */
+	if (!bytes)
+		bytes = 1;
+
 	return tlsf_malloc(tlsf_mem_pool, bytes);
 }
 EXPORT_SYMBOL(malloc);