Commit 92304bf3 authored by M. Mohan Kumar's avatar M. Mohan Kumar Committed by Anthony Liguori
Browse files

hw/9pfs: Fix memory leak in error path 



Fix few more memory leaks in virtio-9p-device.c detected using valgrind.

Signed-off-by: default avatarM. Mohan Kumar <mohan@in.ibm.com>
Message-id: 1372929678-14341-1-git-send-email-mohan@in.ibm.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent b58c86e1

hw/9pfs/virtio-9p-device.c

+17 −9
Original line number Diff line number Diff line
@@ -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;



}



/* virtio-9p device */