Commit 4fa62005 authored by Greg Kurz's avatar Greg Kurz
Browse files

9pfs: check return value of v9fs_co_name_to_path() 



These v9fs_co_name_to_path() call sites have always been around. I guess
no care was taken to check the return value because the name_to_path
operation could never fail at the time. This is no longer true: the
handle and synth backends can already fail this operation, and so will the
local backend soon.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent fcdcf1ee

hw/9pfs/9p.c

+25 −11
Original line number Diff line number Diff line
@@ -2571,7 +2571,10 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, 
            err = -EINVAL;

            goto out;

        }

        v9fs_co_name_to_path(pdu, &dirfidp->path, name->data, &new_path);

        err = v9fs_co_name_to_path(pdu, &dirfidp->path, name->data, &new_path);

        if (err < 0) {

            goto out;

        }

    } else {

        old_name = fidp->path.data;

        end = strrchr(old_name, '/');
@@ -2583,8 +2586,11 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, 
        new_name = g_malloc0(end - old_name + name->size + 1);

        strncat(new_name, old_name, end - old_name);

        strncat(new_name + (end - old_name), name->data, name->size);

        v9fs_co_name_to_path(pdu, NULL, new_name, &new_path);

        err = v9fs_co_name_to_path(pdu, NULL, new_name, &new_path);

        g_free(new_name);

        if (err < 0) {

            goto out;

        }

    }

    err = v9fs_co_rename(pdu, &fidp->path, &new_path);

    if (err < 0) {
@@ -2664,7 +2670,7 @@ out_nofid: 
    v9fs_string_free(&name);

}



static void coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir,

static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir,

                                           V9fsString *old_name,

                                           V9fsPath *newdir,

                                           V9fsString *new_name)
@@ -2672,12 +2678,18 @@ static void coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, 
    V9fsFidState *tfidp;

    V9fsPath oldpath, newpath;

    V9fsState *s = pdu->s;



    int err;



    v9fs_path_init(&oldpath);

    v9fs_path_init(&newpath);

    v9fs_co_name_to_path(pdu, olddir, old_name->data, &oldpath);

    v9fs_co_name_to_path(pdu, newdir, new_name->data, &newpath);

    err = v9fs_co_name_to_path(pdu, olddir, old_name->data, &oldpath);

    if (err < 0) {

        goto out;

    }

    err = v9fs_co_name_to_path(pdu, newdir, new_name->data, &newpath);

    if (err < 0) {

        goto out;

    }



    /*

     * Fixup fid's pointing to the old name to
@@ -2689,8 +2701,10 @@ static void coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, 
            v9fs_fix_path(&tfidp->path, &newpath, strlen(oldpath.data));

        }

    }

out:

    v9fs_path_free(&oldpath);

    v9fs_path_free(&newpath);

    return err;

}



static int coroutine_fn v9fs_complete_renameat(V9fsPDU *pdu, int32_t olddirfid,
@@ -2724,7 +2738,7 @@ static int coroutine_fn v9fs_complete_renameat(V9fsPDU *pdu, int32_t olddirfid, 
    }

    if (s->ctx.export_flags & V9FS_PATHNAME_FSCONTEXT) {

        /* Only for path based fid  we need to do the below fixup */

        v9fs_fix_fid_paths(pdu, &olddirfidp->path, old_name,

        err = v9fs_fix_fid_paths(pdu, &olddirfidp->path, old_name,

                                 &newdirfidp->path, new_name);

    }

out: