RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-23 07:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: free memory before error exit in read_whole_eb

Browse Source 
Free the memory allocated to "multi" before the error
exit in read_whole_eb().  Set it to NULL after we free
it in the loop to avoid any potential double-free.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
This commit is contained in:
Eric Sandeen 2013-02-25 16:54:42 -06:00 committed by David Sterba
parent d310e9cfff
commit 2e23e290ca
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
disk-io.c
View File

@ -198,17 +198,21 @@ static int read_whole_eb(struct btrfs_fs_info *info, struct extent_buffer *eb, i
mirror, NULL); mirror, NULL);
if (ret) { if (ret) {
printk("Couldn't map the block %Lu\n", eb->start + offset); printk("Couldn't map the block %Lu\n", eb->start + offset);
kfree(multi);
return -EIO; return -EIO;
} }
device = multi->stripes[0].dev; device = multi->stripes[0].dev;
if (device->fd == 0) if (device->fd == 0) {
kfree(multi);
return -EIO; return -EIO;
}
eb->fd = device->fd; eb->fd = device->fd;
device->total_ios++; device->total_ios++;
eb->dev_bytenr = multi->stripes[0].physical; eb->dev_bytenr = multi->stripes[0].physical;
kfree(multi); kfree(multi);
multi = NULL;
if (read_len > bytes_left) if (read_len > bytes_left)
read_len = bytes_left; read_len = bytes_left;