From 716418849a0ed4cc7689d4b82a73597a8726de92 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 24 Feb 2010 22:29:19 +1100 Subject: [PATCH] dtc: Audit and fix valgrind errors The somewhat embarrasing bug in the first version of my previous patch would have been detected by valgrind. Thus reminded, I've run the testsuite under valgrind and fixed any errors I found. This turned out to be just some uninitialized buffers in test programs. The fragments of uninitialized data aren't particularly important, but we might as well squash the valgrind warnings, so that future valgrind errors will stand out. Signed-off-by: David Gibson --- tests/mangle-layout.c | 7 ++++--- tests/open_pack.c | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/mangle-layout.c b/tests/mangle-layout.c index 5be28b9..3b19788 100644 --- a/tests/mangle-layout.c +++ b/tests/mangle-layout.c @@ -65,7 +65,7 @@ static void new_header(struct bufstate *buf, int version, const void *fdt) static void add_block(struct bufstate *buf, int version, char block, const void *fdt) { - int align, size; + int align, size, oldsize; const void *src; int offset; @@ -95,9 +95,10 @@ static void add_block(struct bufstate *buf, int version, char block, const void CONFIG("Bad block '%c'", block); } - offset = ALIGN(buf->size, align); - + oldsize = buf->size; + offset = ALIGN(oldsize, align); expand_buf(buf, offset+size); + memset(buf->buf + oldsize, 0, offset - oldsize); memcpy(buf->buf + offset, src, size); diff --git a/tests/open_pack.c b/tests/open_pack.c index d614024..0a5a3fc 100644 --- a/tests/open_pack.c +++ b/tests/open_pack.c @@ -48,6 +48,8 @@ int main(int argc, char *argv[]) bufsize = oldsize * 2; buf = xmalloc(bufsize); + /* don't leak uninitialized memory into our output */ + memset(buf, 0, bufsize); fdt1 = buf; err = fdt_open_into(fdt, fdt1, bufsize);