[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] 9pfs: check return value of v9fs_co_name_to_pa
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 08/11] 9pfs: check return value of v9fs_co_name_to_path() |
Date: |
Mon, 29 May 2017 11:05:37 +0200 |
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: Greg Kurz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/9pfs/9p.c | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index a25d31e62f1c..96d268334865 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -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,20 +2670,26 @@ out_nofid:
v9fs_string_free(&name);
}
-static void coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir,
- V9fsString *old_name,
- V9fsPath *newdir,
- V9fsString *new_name)
+static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir,
+ V9fsString *old_name,
+ V9fsPath *newdir,
+ V9fsString *new_name)
{
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,8 +2738,8 @@ 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,
- &newdirfidp->path, new_name);
+ err = v9fs_fix_fid_paths(pdu, &olddirfidp->path, old_name,
+ &newdirfidp->path, new_name);
}
out:
if (olddirfidp) {
--
2.7.4
- [Qemu-devel] [PULL 00/11] 9pfs patches for 2.10 20170525, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 01/11] virtio-9p/xen-9p: move 9p specific bits to core 9p code, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 03/11] 9pfs: drop pdu_push_and_notify(), Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 02/11] fsdev: don't allow unknown format in marshal/unmarshal, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 05/11] fsdev: fix virtfs-proxy-helper cwd, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 06/11] 9pfs: assume utimensat() and futimens() are present, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 09/11] 9pfs: local: resolve special directories in paths, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 04/11] 9pfs: local: fix unlink of alien files in mapped-file mode, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 07/11] util: drop old utimensat() compat code, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 08/11] 9pfs: check return value of v9fs_co_name_to_path(),
Greg Kurz <=
- [Qemu-devel] [PULL 10/11] 9pfs: local: simplify file opening, Greg Kurz, 2017/05/29
- [Qemu-devel] [PULL 11/11] 9pfs: local: metadata file for the VirtFS root, Greg Kurz, 2017/05/29
- Re: [Qemu-devel] [PULL 00/11] 9pfs patches for 2.10 20170525, no-reply, 2017/05/29
- Re: [Qemu-devel] [PULL 00/11] 9pfs patches for 2.10 20170525, Stefan Hajnoczi, 2017/05/30