Commit 4ed7b2c3 authored by Stefan Weil's avatar Stefan Weil Committed by Aneesh Kumar K.V
Browse files

virtio: Fix memory leaks reported by Coverity 



All four leaks are similar, so fix them in one patch.
Success path was not doing memory free.

Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 25ee9a7f

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

+8 −20
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, 
    int err = -1;

    int serrno = 0;

    V9fsString fullname;

    char *buffer;

    char *buffer = NULL;



    v9fs_string_init(&fullname);

    v9fs_string_sprintf(&fullname, "%s/%s", dir_path->data, name);
@@ -497,7 +497,6 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, 
        buffer = rpath(fs_ctx, path);

        err = mknod(buffer, SM_LOCAL_MODE_BITS|S_IFREG, 0);

        if (err == -1) {

            g_free(buffer);

            goto out;

        }

        err = local_set_xattr(buffer, credp);
@@ -510,7 +509,6 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, 
        buffer = rpath(fs_ctx, path);

        err = mknod(buffer, SM_LOCAL_MODE_BITS|S_IFREG, 0);

        if (err == -1) {

            g_free(buffer);

            goto out;

        }

        err = local_set_mapped_file_attr(fs_ctx, path, credp);
@@ -523,7 +521,6 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, 
        buffer = rpath(fs_ctx, path);

        err = mknod(buffer, credp->fc_mode, credp->fc_rdev);

        if (err == -1) {

            g_free(buffer);

            goto out;

        }

        err = local_post_create_passthrough(fs_ctx, path, credp);
@@ -537,8 +534,8 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, 
err_end:

    remove(buffer);

    errno = serrno;

    g_free(buffer);

out:

    g_free(buffer);

    v9fs_string_free(&fullname);

    return err;

}
@@ -550,7 +547,7 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath *dir_path, 
    int err = -1;

    int serrno = 0;

    V9fsString fullname;

    char *buffer;

    char *buffer = NULL;



    v9fs_string_init(&fullname);

    v9fs_string_sprintf(&fullname, "%s/%s", dir_path->data, name);
@@ -561,7 +558,6 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath *dir_path, 
        buffer = rpath(fs_ctx, path);

        err = mkdir(buffer, SM_LOCAL_DIR_MODE_BITS);

        if (err == -1) {

            g_free(buffer);

            goto out;

        }

        credp->fc_mode = credp->fc_mode|S_IFDIR;
@@ -574,7 +570,6 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath *dir_path, 
        buffer = rpath(fs_ctx, path);

        err = mkdir(buffer, SM_LOCAL_DIR_MODE_BITS);

        if (err == -1) {

            g_free(buffer);

            goto out;

        }

        credp->fc_mode = credp->fc_mode|S_IFDIR;
@@ -588,7 +583,6 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath *dir_path, 
        buffer = rpath(fs_ctx, path);

        err = mkdir(buffer, credp->fc_mode);

        if (err == -1) {

            g_free(buffer);

            goto out;

        }

        err = local_post_create_passthrough(fs_ctx, path, credp);
@@ -602,8 +596,8 @@ static int local_mkdir(FsContext *fs_ctx, V9fsPath *dir_path, 
err_end:

    remove(buffer);

    errno = serrno;

    g_free(buffer);

out:

    g_free(buffer);

    v9fs_string_free(&fullname);

    return err;

}
@@ -657,7 +651,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, 
    int err = -1;

    int serrno = 0;

    V9fsString fullname;

    char *buffer;

    char *buffer = NULL;



    /*

     * Mark all the open to not follow symlinks
@@ -673,7 +667,6 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, 
        buffer = rpath(fs_ctx, path);

        fd = open(buffer, flags, SM_LOCAL_MODE_BITS);

        if (fd == -1) {

            g_free(buffer);

            err = fd;

            goto out;

        }
@@ -688,7 +681,6 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, 
        buffer = rpath(fs_ctx, path);

        fd = open(buffer, flags, SM_LOCAL_MODE_BITS);

        if (fd == -1) {

            g_free(buffer);

            err = fd;

            goto out;

        }
@@ -704,7 +696,6 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, 
        buffer = rpath(fs_ctx, path);

        fd = open(buffer, flags, credp->fc_mode);

        if (fd == -1) {

            g_free(buffer);

            err = fd;

            goto out;

        }
@@ -722,8 +713,8 @@ err_end: 
    close(fd);

    remove(buffer);

    errno = serrno;

    g_free(buffer);

out:

    g_free(buffer);

    v9fs_string_free(&fullname);

    return err;

}
@@ -736,7 +727,7 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, 
    int serrno = 0;

    char *newpath;

    V9fsString fullname;

    char *buffer;

    char *buffer = NULL;



    v9fs_string_init(&fullname);

    v9fs_string_sprintf(&fullname, "%s/%s", dir_path->data, name);
@@ -749,7 +740,6 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, 
        buffer = rpath(fs_ctx, newpath);

        fd = open(buffer, O_CREAT|O_EXCL|O_RDWR|O_NOFOLLOW, SM_LOCAL_MODE_BITS);

        if (fd == -1) {

            g_free(buffer);

            err = fd;

            goto out;

        }
@@ -779,7 +769,6 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, 
        buffer = rpath(fs_ctx, newpath);

        fd = open(buffer, O_CREAT|O_EXCL|O_RDWR|O_NOFOLLOW, SM_LOCAL_MODE_BITS);

        if (fd == -1) {

            g_free(buffer);

            err = fd;

            goto out;

        }
@@ -808,7 +797,6 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, 
        buffer = rpath(fs_ctx, newpath);

        err = symlink(oldpath, buffer);

        if (err) {

            g_free(buffer);

            goto out;

        }

        err = lchown(buffer, credp->fc_uid, credp->fc_gid);
@@ -829,8 +817,8 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, 
err_end:

    remove(buffer);

    errno = serrno;

    g_free(buffer);

out:

    g_free(buffer);

    v9fs_string_free(&fullname);

    return err;

}