OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

9p: Properly check/translate flags in unlinkat

Browse Source 
The 9p-local code previously relied on P9_DOTL_AT_REMOVEDIR and AT_REMOVEDIR
having the same numerical value and deferred any errorchecking to the
syscall itself. However, while the former assumption is true on Linux,
it is not true in general. 9p-handle did this properly however. Move
the translation code to the generic 9p server code and add an error
if unrecognized flags are passed.

Signed-off-by: Keno Fischer <keno@juliacomputing.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
Keno Fischer 2018-06-07 12:17:22 +02:00 committed by Greg Kurz
parent 5b7b2f9a85
commit 67e8734574
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/9pfs/9p-handle.c
View File

@ -559,19 +559,13 @@ static int handle_unlinkat(FsContext *ctx, V9fsPath *dir,
{ {
int dirfd, ret; int dirfd, ret;
HandleData *data = (HandleData *) ctx->private; HandleData *data = (HandleData *) ctx->private;
int rflags;
dirfd = open_by_handle(data->mountfd, dir->data, O_PATH); dirfd = open_by_handle(data->mountfd, dir->data, O_PATH);
if (dirfd < 0) { if (dirfd < 0) {
return dirfd; return dirfd;
} }
rflags = 0; ret = unlinkat(dirfd, name, flags);
if (flags & P9_DOTL_AT_REMOVEDIR) {
rflags |= AT_REMOVEDIR;
}
ret = unlinkat(dirfd, name, rflags);
close(dirfd); close(dirfd);
return ret; return ret;

13
hw/9pfs/9p.c
View File

@ -2522,7 +2522,7 @@ static void coroutine_fn v9fs_unlinkat(void *opaque)
{ {
int err = 0; int err = 0;
V9fsString name; V9fsString name;
int32_t dfid, flags; int32_t dfid, flags, rflags = 0;
size_t offset = 7; size_t offset = 7;
V9fsPath path; V9fsPath path;
V9fsFidState *dfidp; V9fsFidState *dfidp;
@ -2549,6 +2549,15 @@ static void coroutine_fn v9fs_unlinkat(void *opaque)
goto out_nofid; goto out_nofid;
} }
if (flags & ~P9_DOTL_AT_REMOVEDIR) {
err = -EINVAL;
goto out_nofid;
}
if (flags & P9_DOTL_AT_REMOVEDIR) {
rflags |= AT_REMOVEDIR;
}
dfidp = get_fid(pdu, dfid); dfidp = get_fid(pdu, dfid);
if (dfidp == NULL) { if (dfidp == NULL) {
err = -EINVAL; err = -EINVAL;
@ -2567,7 +2576,7 @@ static void coroutine_fn v9fs_unlinkat(void *opaque)
if (err < 0) { if (err < 0) {
goto out_err; goto out_err;
} }
err = v9fs_co_unlinkat(pdu, &dfidp->path, &name, flags); err = v9fs_co_unlinkat(pdu, &dfidp->path, &name, rflags);
if (!err) { if (!err) {
err = offset; err = offset;
} }