RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Gui Hecheng 2014-08-21 11:35:36 +08:00 committed by David Sterba
parent 90a379a876
commit 2527730d5d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds-restore.c
View File

@ -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);