From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvsbK-0007Lw-3A for qemu-devel@nongnu.org; Sun, 07 Jul 2013 13:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvsbJ-0000TD-0C for qemu-devel@nongnu.org; Sun, 07 Jul 2013 13:18:18 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:42722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvsbI-0000Sx-C8 for qemu-devel@nongnu.org; Sun, 07 Jul 2013 13:18:16 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 7 Jul 2013 22:41:51 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id AAAF7E0053 for ; Sun, 7 Jul 2013 22:47:54 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r67HI7YR25624636 for ; Sun, 7 Jul 2013 22:48:07 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r67HI9U4015416 for ; Mon, 8 Jul 2013 03:18:10 +1000 From: "Aneesh Kumar K.V" In-Reply-To: <1372929678-14341-1-git-send-email-mohan@in.ibm.com> References: <1372929678-14341-1-git-send-email-mohan@in.ibm.com> Date: Sun, 07 Jul 2013 22:48:09 +0530 Message-ID: <87vc4m9tm6.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/1] hw/9pfs: Fix memory leak in error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "M. Mohan Kumar" , qemu-devel@nongnu.org, Anthony Liguori "M. Mohan Kumar" writes: > From: "M. Mohan Kumar" > > Fix few more memory leaks in virtio-9p-device.c detected using valgrind. > > Signed-off-by: M. Mohan Kumar > --- > hw/9pfs/virtio-9p-device.c | 26 +++++++++++++++++--------- > 1 file changed, 17 insertions(+), 9 deletions(-) > > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c > index dc6f4e4..35e2af4 100644 > --- a/hw/9pfs/virtio-9p-device.c > +++ b/hw/9pfs/virtio-9p-device.c > @@ -68,14 +68,14 @@ static int virtio_9p_device_init(VirtIODevice *vdev) > fprintf(stderr, "Virtio-9p device couldn't find fsdev with the " > "id = %s\n", > s->fsconf.fsdev_id ? s->fsconf.fsdev_id : "NULL"); > - return -1; > + goto out; > } > > if (!s->fsconf.tag) { > /* we haven't specified a mount_tag */ > fprintf(stderr, "fsdev with id %s needs mount_tag arguments\n", > s->fsconf.fsdev_id); > - return -1; > + goto out; > } > > s->ctx.export_flags = fse->export_flags; > @@ -85,10 +85,10 @@ static int virtio_9p_device_init(VirtIODevice *vdev) > if (len > MAX_TAG_LEN - 1) { > fprintf(stderr, "mount tag '%s' (%d bytes) is longer than " > "maximum (%d bytes)", s->fsconf.tag, len, MAX_TAG_LEN - 1); > - return -1; > + goto out; > } > > - s->tag = strdup(s->fsconf.tag); > + s->tag = g_strdup(s->fsconf.tag); > s->ctx.uid = -1; > > s->ops = fse->ops; > @@ -99,11 +99,11 @@ static int virtio_9p_device_init(VirtIODevice *vdev) > if (s->ops->init(&s->ctx) < 0) { > fprintf(stderr, "Virtio-9p Failed to initialize fs-driver with id:%s" > " and export path:%s\n", s->fsconf.fsdev_id, s->ctx.fs_root); > - return -1; > + goto out; > } > if (v9fs_init_worker_threads() < 0) { > fprintf(stderr, "worker thread initialization failed\n"); > - return -1; > + goto out; > } > > /* > @@ -115,18 +115,26 @@ static int virtio_9p_device_init(VirtIODevice *vdev) > if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) { > fprintf(stderr, > "error in converting name to path %s", strerror(errno)); > - return -1; > + goto out; > } > if (s->ops->lstat(&s->ctx, &path, &stat)) { > fprintf(stderr, "share path %s does not exist\n", fse->path); > - return -1; > + goto out; > } else if (!S_ISDIR(stat.st_mode)) { > fprintf(stderr, "share path %s is not a directory\n", fse->path); > - return -1; > + goto out; > } > v9fs_path_free(&path); > > return 0; > +out: > + g_free(s->ctx.fs_root); > + g_free(s->tag); > + virtio_cleanup(vdev); > + v9fs_path_free(&path); > + > + return -1; > + > } > The error path will result in qemu terminating right ? Do we care about g_free in those case ? -aneesh