diff --git a/kernel/ethosu_buffer.c b/kernel/ethosu_buffer.c
index fb4a8b4..9033f8b 100644
--- a/kernel/ethosu_buffer.c
+++ b/kernel/ethosu_buffer.c
@@ -75,9 +75,11 @@
 
 	dev_info(dev, "Buffer destroy. buf=0x%pK", buf);
 
+	memset(buf->cpu_addr, 0, buf->capacity);
 	dma_free_coherent(dev, buf->capacity, buf->cpu_addr,
 			  buf->dma_addr);
 
+	memset(buf, 0, sizeof(*buf));
 	devm_kfree(dev, buf);
 }
 
@@ -214,6 +216,7 @@
 			  buf->dma_addr);
 
 free_buf:
+	memset(buf, 0, sizeof(*buf));
 	devm_kfree(dev, buf);
 
 	return ret;