[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] vvfat: Fix memory leak
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 3/9] vvfat: Fix memory leak |
Date: |
Mon, 19 Nov 2018 15:29:38 +0100 |
Don't leak 'cluster' in the mapping == NULL case. Found by Coverity
(CID 1055918).
Fixes: 8d9401c2791ee2d2805b741b1ee3006041edcd3e
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Liam Merwick <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
block/vvfat.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 1de5de1db4..b7b61ea8b7 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2510,7 +2510,7 @@ static int commit_one_file(BDRVVVFATState* s,
uint32_t first_cluster = c;
mapping_t* mapping = find_mapping_for_cluster(s, c);
uint32_t size = filesize_of_direntry(direntry);
- char* cluster = g_malloc(s->cluster_size);
+ char *cluster;
uint32_t i;
int fd = 0;
@@ -2528,17 +2528,17 @@ static int commit_one_file(BDRVVVFATState* s,
if (fd < 0) {
fprintf(stderr, "Could not open %s... (%s, %d)\n", mapping->path,
strerror(errno), errno);
- g_free(cluster);
return fd;
}
if (offset > 0) {
if (lseek(fd, offset, SEEK_SET) != offset) {
qemu_close(fd);
- g_free(cluster);
return -3;
}
}
+ cluster = g_malloc(s->cluster_size);
+
while (offset < size) {
uint32_t c1;
int rest_size = (size - offset > s->cluster_size ?
--
2.19.1
- [Qemu-devel] [PULL 0/9] Block layer patches, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 1/9] nvme: fix oob access issue(CVE-2018-16847), Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 2/9] fdc: fix segfault in fdctrl_stop_transfer() when DMA is disabled, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 3/9] vvfat: Fix memory leak,
Kevin Wolf <=
- [Qemu-devel] [PULL 5/9] qcow2: Don't allow overflow during cluster allocation, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 7/9] block: Always abort reopen after prepare succeeded, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 4/9] qcow2: Document some maximum size constraints, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 8/9] file-posix: Fix shared locks on reopen commit, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 9/9] iotests: Test file-posix locking and reopen, Kevin Wolf, 2018/11/19
- [Qemu-devel] [PULL 6/9] iotests: Add new test 220 for max compressed cluster offset, Kevin Wolf, 2018/11/19
- Re: [Qemu-devel] [PULL 0/9] Block layer patches, Peter Maydell, 2018/11/19