diff options
| author | Jan Dakinevich <jan.dakinevich@gmail.com> | 2017-09-20 08:48:52 +0200 |
|---|---|---|
| committer | Greg Kurz <groug@kaod.org> | 2017-09-20 08:48:52 +0200 |
| commit | 4d8bc7334b06ef01a21cad3d1eb8dc183037a06b (patch) | |
| tree | 141e82abde1d9386c691b5f2718ced9956cb6c1b | |
| parent | 6069537f4336a59054afda91a6545d3648c64619 (diff) | |
9pfs: fix name_to_path assertion in v9fs_complete_rename()
The third parameter of v9fs_co_name_to_path() must not contain `/'
character.
The issue is most likely related to 9p2000.u protocol only.
Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
[groug, regression caused by commit f57f5878578a # 2.10]
Signed-off-by: Greg Kurz <groug@kaod.org>
| -rw-r--r-- | hw/9pfs/9p.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 1078cfdaa4..cdd44bdc82 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -2553,13 +2553,11 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, int32_t newdirfid, V9fsString *name) { - char *end; int err = 0; V9fsPath new_path; V9fsFidState *tfidp; V9fsState *s = pdu->s; V9fsFidState *dirfidp = NULL; - char *old_name, *new_name; v9fs_path_init(&new_path); if (newdirfid != -1) { @@ -2577,18 +2575,15 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, goto out; } } else { - old_name = fidp->path.data; - end = strrchr(old_name, '/'); - if (end) { - end++; - } else { - end = old_name; - } - 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); - err = v9fs_co_name_to_path(pdu, NULL, new_name, &new_path); - g_free(new_name); + char *dir_name = g_path_get_dirname(fidp->path.data); + V9fsPath dir_path; + + v9fs_path_init(&dir_path); + v9fs_path_sprintf(&dir_path, "%s", dir_name); + g_free(dir_name); + + err = v9fs_co_name_to_path(pdu, &dir_path, name->data, &new_path); + v9fs_path_free(&dir_path); if (err < 0) { goto out; } |