From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOkZ6-0001Mv-EJ for qemu-devel@nongnu.org; Mon, 19 Nov 2018 09:30:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOkZ1-00074q-Qw for qemu-devel@nongnu.org; Mon, 19 Nov 2018 09:30:16 -0500 From: Kevin Wolf Date: Mon, 19 Nov 2018 15:29:38 +0100 Message-Id: <20181119142944.29061-4-kwolf@redhat.com> In-Reply-To: <20181119142944.29061-1-kwolf@redhat.com> References: <20181119142944.29061-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/9] vvfat: Fix memory leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Don't leak 'cluster' in the mapping =3D=3D NULL case. Found by Coverity (CID 1055918). Fixes: 8d9401c2791ee2d2805b741b1ee3006041edcd3e Signed-off-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Liam Merwick Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D c; mapping_t* mapping =3D find_mapping_for_cluster(s, c); uint32_t size =3D filesize_of_direntry(direntry); - char* cluster =3D g_malloc(s->cluster_size); + char *cluster; uint32_t i; int fd =3D 0; =20 @@ -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) !=3D offset) { qemu_close(fd); - g_free(cluster); return -3; } } =20 + cluster =3D g_malloc(s->cluster_size); + while (offset < size) { uint32_t c1; int rest_size =3D (size - offset > s->cluster_size ? --=20 2.19.1