diff options
| author | Gui Hecheng <guihc.fnst@cn.fujitsu.com> | 2014-08-21 11:35:36 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-09-14 13:10:44 +0200 |
| commit | 2527730d5d7e34b7848d8a49b47830e91adb10a1 (patch) | |
| tree | 9bad7b92a89eefa3dd802fa4e770450daafe7c32 | |
| parent | 90a379a876192ad0aca1ee81332f055886f8a5e8 (diff) | |
btrfs-progs: init uninitialized output buf for btrfs-restore
A memory problem reported by valgrind as follows:
=== Syscall param pwrite64(buf) points to uninitialised byte(s)
When running:
# valgrind --leak-check=yes btrfs restore /dev/sda9 /mnt/backup
Because the output buf size is alloced with malloc, but the length of
output data is shorter than the sizeof(buf), so valgrind report
uninitialised byte(s).
We could use calloc to repalce malloc and clear this WARNING away.
Reported-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
| -rw-r--r-- | cmds-restore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds-restore.c b/cmds-restore.c index dc6c0274..e2bcbf92 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -251,7 +251,7 @@ static int copy_one_inline(int fd, struct btrfs_path *path, u64 pos) } ram_size = btrfs_file_extent_ram_bytes(leaf, fi); - outbuf = malloc(ram_size); + outbuf = calloc(1, ram_size); if (!outbuf) { fprintf(stderr, "No memory\n"); return -ENOMEM; @@ -320,7 +320,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd, } if (compress != BTRFS_COMPRESS_NONE) { - outbuf = malloc(ram_size); + outbuf = calloc(1, ram_size); if (!outbuf) { fprintf(stderr, "No memory\n"); free(inbuf); |