falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

9pfs: local: improve error handling in link op 

When using the mapped-file security model, we also have to create a link
for the metadata file if it exists. In case of failure, we should rollback.

That's what this patch does.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 6dd4b1f1d0)
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Greg Kurz 2017-02-26 23:44:11 +01:00 committed by Michael Roth
parent d93d06a2fc
commit d7322e13c6
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/9pfs/9p-local.c
View File

@ -921,6 +921,7 @@ static int local_link(FsContext *ctx, V9fsPath *oldpath,
int ret; int ret;
V9fsString newpath; V9fsString newpath;
char *buffer, *buffer1; char *buffer, *buffer1;
int serrno;
v9fs_string_init(&newpath); v9fs_string_init(&newpath);
v9fs_string_sprintf(&newpath, "%s/%s", dirpath->data, name); v9fs_string_sprintf(&newpath, "%s/%s", dirpath->data, name);
@ -929,25 +930,36 @@ static int local_link(FsContext *ctx, V9fsPath *oldpath,
buffer1 = rpath(ctx, newpath.data); buffer1 = rpath(ctx, newpath.data);
ret = link(buffer, buffer1); ret = link(buffer, buffer1);
g_free(buffer); g_free(buffer);
g_free(buffer1); if (ret < 0) {
goto out;
}
/* now link the virtfs_metadata files */ /* now link the virtfs_metadata files */
if (!ret && (ctx->export_flags & V9FS_SM_MAPPED_FILE)) { if (ctx->export_flags & V9FS_SM_MAPPED_FILE) {
char *vbuffer, *vbuffer1;
/* Link the .virtfs_metadata files. Create the metada directory */ /* Link the .virtfs_metadata files. Create the metada directory */
ret = local_create_mapped_attr_dir(ctx, newpath.data); ret = local_create_mapped_attr_dir(ctx, newpath.data);
if (ret < 0) { if (ret < 0) {
goto err_out; goto err_out;
} }
buffer = local_mapped_attr_path(ctx, oldpath->data); vbuffer = local_mapped_attr_path(ctx, oldpath->data);
buffer1 = local_mapped_attr_path(ctx, newpath.data); vbuffer1 = local_mapped_attr_path(ctx, newpath.data);
ret = link(buffer, buffer1); ret = link(vbuffer, vbuffer1);
g_free(buffer); g_free(vbuffer);
g_free(buffer1); g_free(vbuffer1);
if (ret < 0 && errno != ENOENT) { if (ret < 0 && errno != ENOENT) {
goto err_out; goto err_out;
} }
} }
goto out;
err_out: err_out:
serrno = errno;
remove(buffer1);
errno = serrno;
out:
g_free(buffer1);
v9fs_string_free(&newpath); v9fs_string_free(&newpath);
return ret; return ret;
} }
@ -1190,14 +1202,12 @@ static int local_renameat(FsContext *ctx, V9fsPath *olddir,
goto err_undo_rename; goto err_undo_rename;
} }
omap_dirfd = openat(odirfd, VIRTFS_META_DIR, omap_dirfd = openat_dir(odirfd, VIRTFS_META_DIR);
O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
if (omap_dirfd == -1) { if (omap_dirfd == -1) {
goto err; goto err;
} }
nmap_dirfd = openat(ndirfd, VIRTFS_META_DIR, nmap_dirfd = openat_dir(ndirfd, VIRTFS_META_DIR);
O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
if (nmap_dirfd == -1) { if (nmap_dirfd == -1) {
close_preserve_errno(omap_dirfd); close_preserve_errno(omap_dirfd);
goto err; goto err;