mirror of https://github.com/xemu-project/xemu.git
hw/9pfs: Create other filesystem objects
Add interfaces to create filesystem objects like directory, device nodes, symbolic links, links for proxy filesytem driver Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
M. Mohan Kumar
Aneesh Kumar K.V
parent
daf0b9aca9
commit
39f8c32c3f
|
|
@ -231,6 +231,30 @@ static int send_fd(int sockfd, int fd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int send_status(int sockfd, struct iovec *iovec, int status)
|
||||
{
|
||||
ProxyHeader header;
|
||||
int retval, msg_size;;
|
||||
|
||||
if (status < 0) {
|
||||
header.type = T_ERROR;
|
||||
} else {
|
||||
header.type = T_SUCCESS;
|
||||
}
|
||||
header.size = sizeof(status);
|
||||
/*
|
||||
* marshal the return status. We don't check error.
|
||||
* because we are sure we have enough space for the status
|
||||
*/
|
||||
msg_size = proxy_marshal(iovec, 0, "ddd", header.type,
|
||||
header.size, status);
|
||||
retval = socket_write(sockfd, iovec->iov_base, msg_size);
|
||||
if (retval < 0) {
|
||||
return retval;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* from man 7 capabilities, section
|
||||
* Effect of User ID Changes on Capabilities:
|
||||
|
|
@ -261,6 +285,67 @@ static int setfsugid(int uid, int gid)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* create other filesystem objects and send 0 on success
|
||||
* return -errno on error
|
||||
*/
|
||||
static int do_create_others(int type, struct iovec *iovec)
|
||||
{
|
||||
dev_t rdev;
|
||||
int retval = 0;
|
||||
int offset = PROXY_HDR_SZ;
|
||||
V9fsString oldpath, path;
|
||||
int mode, uid, gid, cur_uid, cur_gid;
|
||||
|
||||
v9fs_string_init(&path);
|
||||
v9fs_string_init(&oldpath);
|
||||
cur_uid = geteuid();
|
||||
cur_gid = getegid();
|
||||
|
||||
retval = proxy_unmarshal(iovec, offset, "dd", &uid, &gid);
|
||||
if (retval < 0) {
|
||||
return retval;
|
||||
}
|
||||
offset += retval;
|
||||
retval = setfsugid(uid, gid);
|
||||
if (retval < 0) {
|
||||
retval = -errno;
|
||||
goto err_out;
|
||||
}
|
||||
switch (type) {
|
||||
case T_MKNOD:
|
||||
retval = proxy_unmarshal(iovec, offset, "sdq", &path, &mode, &rdev);
|
||||
if (retval < 0) {
|
||||
goto err_out;
|
||||
}
|
||||
retval = mknod(path.data, mode, rdev);
|
||||
break;
|
||||
case T_MKDIR:
|
||||
retval = proxy_unmarshal(iovec, offset, "sd", &path, &mode);
|
||||
if (retval < 0) {
|
||||
goto err_out;
|
||||
}
|
||||
retval = mkdir(path.data, mode);
|
||||
break;
|
||||
case T_SYMLINK:
|
||||
retval = proxy_unmarshal(iovec, offset, "ss", &oldpath, &path);
|
||||
if (retval < 0) {
|
||||
goto err_out;
|
||||
}
|
||||
retval = symlink(oldpath.data, path.data);
|
||||
break;
|
||||
}
|
||||
if (retval < 0) {
|
||||
retval = -errno;
|
||||
}
|
||||
|
||||
err_out:
|
||||
v9fs_string_free(&path);
|
||||
v9fs_string_free(&oldpath);
|
||||
setfsugid(cur_uid, cur_gid);
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*
|
||||
* create a file and send fd on success
|
||||
* return -errno on error
|
||||
|
|
@ -332,7 +417,8 @@ static void usage(char *prog)
|
|||
basename(prog));
|
||||
}
|
||||
|
||||
static int process_reply(int sock, int type, int retval)
|
||||
static int process_reply(int sock, int type,
|
||||
struct iovec *out_iovec, int retval)
|
||||
{
|
||||
switch (type) {
|
||||
case T_OPEN:
|
||||
|
|
@ -341,6 +427,14 @@ static int process_reply(int sock, int type, int retval)
|
|||
return -1;
|
||||
}
|
||||
break;
|
||||
case T_MKNOD:
|
||||
case T_MKDIR:
|
||||
case T_SYMLINK:
|
||||
case T_LINK:
|
||||
if (send_status(sock, out_iovec, retval) < 0) {
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
break;
|
||||
|
|
@ -352,10 +446,14 @@ static int process_requests(int sock)
|
|||
{
|
||||
int retval = 0;
|
||||
ProxyHeader header;
|
||||
struct iovec in_iovec;
|
||||
V9fsString oldpath, path;
|
||||
struct iovec in_iovec, out_iovec;
|
||||
|
||||
in_iovec.iov_base = g_malloc(PROXY_MAX_IO_SZ + PROXY_HDR_SZ);
|
||||
in_iovec.iov_len = PROXY_MAX_IO_SZ + PROXY_HDR_SZ;
|
||||
out_iovec.iov_base = g_malloc(PROXY_MAX_IO_SZ + PROXY_HDR_SZ);
|
||||
out_iovec.iov_len = PROXY_MAX_IO_SZ + PROXY_HDR_SZ;
|
||||
|
||||
in_iovec.iov_base = g_malloc(PROXY_MAX_IO_SZ + PROXY_HDR_SZ);
|
||||
in_iovec.iov_len = PROXY_MAX_IO_SZ + PROXY_HDR_SZ;
|
||||
while (1) {
|
||||
/*
|
||||
* initialize the header type, so that we send
|
||||
|
|
@ -374,18 +472,37 @@ static int process_requests(int sock)
|
|||
case T_CREATE:
|
||||
retval = do_create(&in_iovec);
|
||||
break;
|
||||
case T_MKNOD:
|
||||
case T_MKDIR:
|
||||
case T_SYMLINK:
|
||||
retval = do_create_others(header.type, &in_iovec);
|
||||
break;
|
||||
case T_LINK:
|
||||
v9fs_string_init(&path);
|
||||
v9fs_string_init(&oldpath);
|
||||
retval = proxy_unmarshal(&in_iovec, PROXY_HDR_SZ,
|
||||
"ss", &oldpath, &path);
|
||||
if (retval > 0) {
|
||||
retval = link(oldpath.data, path.data);
|
||||
if (retval < 0) {
|
||||
retval = -errno;
|
||||
}
|
||||
}
|
||||
v9fs_string_free(&oldpath);
|
||||
v9fs_string_free(&path);
|
||||
break;
|
||||
default:
|
||||
goto err_out;
|
||||
break;
|
||||
}
|
||||
|
||||
if (process_reply(sock, header.type, retval) < 0) {
|
||||
if (process_reply(sock, header.type, &out_iovec, retval) < 0) {
|
||||
goto err_out;
|
||||
}
|
||||
}
|
||||
(void)socket_write;
|
||||
err_out:
|
||||
g_free(in_iovec.iov_base);
|
||||
g_free(out_iovec.iov_base);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@
|
|||
typedef struct V9fsProxy {
|
||||
int sockfd;
|
||||
QemuMutex mutex;
|
||||
struct iovec iovec;
|
||||
struct iovec in_iovec;
|
||||
struct iovec out_iovec;
|
||||
} V9fsProxy;
|
||||
|
||||
/*
|
||||
|
|
@ -78,6 +79,60 @@ static int v9fs_receivefd(int sockfd, int *status)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t socket_read(int sockfd, void *buff, size_t size)
|
||||
{
|
||||
ssize_t retval, total = 0;
|
||||
|
||||
while (size) {
|
||||
retval = read(sockfd, buff, size);
|
||||
if (retval == 0) {
|
||||
return -EIO;
|
||||
}
|
||||
if (retval < 0) {
|
||||
if (errno == EINTR) {
|
||||
continue;
|
||||
}
|
||||
return -errno;
|
||||
}
|
||||
size -= retval;
|
||||
buff += retval;
|
||||
total += retval;
|
||||
}
|
||||
return total;
|
||||
}
|
||||
|
||||
/*
|
||||
* return < 0 on transport error.
|
||||
* *status is valid only if return >= 0
|
||||
*/
|
||||
static int v9fs_receive_status(V9fsProxy *proxy,
|
||||
struct iovec *reply, int *status)
|
||||
{
|
||||
int retval;
|
||||
ProxyHeader header;
|
||||
|
||||
*status = 0;
|
||||
reply->iov_len = 0;
|
||||
retval = socket_read(proxy->sockfd, reply->iov_base, PROXY_HDR_SZ);
|
||||
if (retval < 0) {
|
||||
return retval;
|
||||
}
|
||||
reply->iov_len = PROXY_HDR_SZ;
|
||||
proxy_unmarshal(reply, 0, "dd", &header.type, &header.size);
|
||||
if (header.size != sizeof(int)) {
|
||||
*status = -ENOBUFS;
|
||||
return 0;
|
||||
}
|
||||
retval = socket_read(proxy->sockfd,
|
||||
reply->iov_base + PROXY_HDR_SZ, header.size);
|
||||
if (retval < 0) {
|
||||
return retval;
|
||||
}
|
||||
reply->iov_len += header.size;
|
||||
proxy_unmarshal(reply, PROXY_HDR_SZ, "d", status);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Proxy->header and proxy->request written to socket by QEMU process.
|
||||
* This request read by proxy helper process
|
||||
|
|
@ -86,12 +141,13 @@ static int v9fs_receivefd(int sockfd, int *status)
|
|||
static int v9fs_request(V9fsProxy *proxy, int type,
|
||||
void *response, const char *fmt, ...)
|
||||
{
|
||||
dev_t rdev;
|
||||
va_list ap;
|
||||
int retval = 0;
|
||||
V9fsString *path;
|
||||
ProxyHeader header = { 0, 0};
|
||||
struct iovec *iovec = NULL;
|
||||
int flags, mode, uid, gid;
|
||||
V9fsString *path, *oldpath;
|
||||
struct iovec *iovec = NULL, *reply = NULL;
|
||||
|
||||
qemu_mutex_lock(&proxy->mutex);
|
||||
|
||||
|
|
@ -99,8 +155,8 @@ static int v9fs_request(V9fsProxy *proxy, int type,
|
|||
retval = -EIO;
|
||||
goto err_out;
|
||||
}
|
||||
iovec = &proxy->iovec;
|
||||
|
||||
iovec = &proxy->out_iovec;
|
||||
reply = &proxy->in_iovec;
|
||||
va_start(ap, fmt);
|
||||
switch (type) {
|
||||
case T_OPEN:
|
||||
|
|
@ -125,6 +181,53 @@ static int v9fs_request(V9fsProxy *proxy, int type,
|
|||
header.type = T_CREATE;
|
||||
}
|
||||
break;
|
||||
case T_MKNOD:
|
||||
path = va_arg(ap, V9fsString *);
|
||||
mode = va_arg(ap, int);
|
||||
rdev = va_arg(ap, long int);
|
||||
uid = va_arg(ap, int);
|
||||
gid = va_arg(ap, int);
|
||||
retval = proxy_marshal(iovec, PROXY_HDR_SZ, "ddsdq",
|
||||
uid, gid, path, mode, rdev);
|
||||
if (retval > 0) {
|
||||
header.size = retval;
|
||||
header.type = T_MKNOD;
|
||||
}
|
||||
break;
|
||||
case T_MKDIR:
|
||||
path = va_arg(ap, V9fsString *);
|
||||
mode = va_arg(ap, int);
|
||||
uid = va_arg(ap, int);
|
||||
gid = va_arg(ap, int);
|
||||
retval = proxy_marshal(iovec, PROXY_HDR_SZ, "ddsd",
|
||||
uid, gid, path, mode);
|
||||
if (retval > 0) {
|
||||
header.size = retval;
|
||||
header.type = T_MKDIR;
|
||||
}
|
||||
break;
|
||||
case T_SYMLINK:
|
||||
oldpath = va_arg(ap, V9fsString *);
|
||||
path = va_arg(ap, V9fsString *);
|
||||
uid = va_arg(ap, int);
|
||||
gid = va_arg(ap, int);
|
||||
retval = proxy_marshal(iovec, PROXY_HDR_SZ, "ddss",
|
||||
uid, gid, oldpath, path);
|
||||
if (retval > 0) {
|
||||
header.size = retval;
|
||||
header.type = T_SYMLINK;
|
||||
}
|
||||
break;
|
||||
case T_LINK:
|
||||
oldpath = va_arg(ap, V9fsString *);
|
||||
path = va_arg(ap, V9fsString *);
|
||||
retval = proxy_marshal(iovec, PROXY_HDR_SZ, "ss",
|
||||
oldpath, path);
|
||||
if (retval > 0) {
|
||||
header.size = retval;
|
||||
header.type = T_LINK;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
error_report("Invalid type %d\n", type);
|
||||
retval = -EINVAL;
|
||||
|
|
@ -156,6 +259,14 @@ static int v9fs_request(V9fsProxy *proxy, int type,
|
|||
goto close_error;
|
||||
}
|
||||
break;
|
||||
case T_MKNOD:
|
||||
case T_MKDIR:
|
||||
case T_SYMLINK:
|
||||
case T_LINK:
|
||||
if (v9fs_receive_status(proxy, reply, &retval) < 0) {
|
||||
goto close_error;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
err_out:
|
||||
|
|
@ -301,15 +412,41 @@ static int proxy_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
|
|||
static int proxy_mknod(FsContext *fs_ctx, V9fsPath *dir_path,
|
||||
const char *name, FsCred *credp)
|
||||
{
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
int retval;
|
||||
V9fsString fullname;
|
||||
|
||||
v9fs_string_init(&fullname);
|
||||
v9fs_string_sprintf(&fullname, "%s/%s", dir_path->data, name);
|
||||
|
||||
retval = v9fs_request(fs_ctx->private, T_MKNOD, NULL, "sdqdd",
|
||||
&fullname, credp->fc_mode, credp->fc_rdev,
|
||||
credp->fc_uid, credp->fc_gid);
|
||||
v9fs_string_free(&fullname);
|
||||
if (retval < 0) {
|
||||
errno = -retval;
|
||||
retval = -1;
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int proxy_mkdir(FsContext *fs_ctx, V9fsPath *dir_path,
|
||||
const char *name, FsCred *credp)
|
||||
{
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
int retval;
|
||||
V9fsString fullname;
|
||||
|
||||
v9fs_string_init(&fullname);
|
||||
v9fs_string_sprintf(&fullname, "%s/%s", dir_path->data, name);
|
||||
|
||||
retval = v9fs_request(fs_ctx->private, T_MKDIR, NULL, "sddd", &fullname,
|
||||
credp->fc_mode, credp->fc_uid, credp->fc_gid);
|
||||
v9fs_string_free(&fullname);
|
||||
if (retval < 0) {
|
||||
errno = -retval;
|
||||
retval = -1;
|
||||
}
|
||||
v9fs_string_free(&fullname);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int proxy_fstat(FsContext *fs_ctx, int fid_type,
|
||||
|
|
@ -344,19 +481,46 @@ static int proxy_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name,
|
|||
return fs->fd;
|
||||
}
|
||||
|
||||
|
||||
static int proxy_symlink(FsContext *fs_ctx, const char *oldpath,
|
||||
V9fsPath *dir_path, const char *name, FsCred *credp)
|
||||
{
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
int retval;
|
||||
V9fsString fullname, target;
|
||||
|
||||
v9fs_string_init(&fullname);
|
||||
v9fs_string_init(&target);
|
||||
|
||||
v9fs_string_sprintf(&fullname, "%s/%s", dir_path->data, name);
|
||||
v9fs_string_sprintf(&target, "%s", oldpath);
|
||||
|
||||
retval = v9fs_request(fs_ctx->private, T_SYMLINK, NULL, "ssdd",
|
||||
&target, &fullname, credp->fc_uid, credp->fc_gid);
|
||||
v9fs_string_free(&fullname);
|
||||
v9fs_string_free(&target);
|
||||
if (retval < 0) {
|
||||
errno = -retval;
|
||||
retval = -1;
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int proxy_link(FsContext *ctx, V9fsPath *oldpath,
|
||||
V9fsPath *dirpath, const char *name)
|
||||
{
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
int retval;
|
||||
V9fsString newpath;
|
||||
|
||||
v9fs_string_init(&newpath);
|
||||
v9fs_string_sprintf(&newpath, "%s/%s", dirpath->data, name);
|
||||
|
||||
retval = v9fs_request(ctx->private, T_LINK, NULL, "ss",
|
||||
oldpath, &newpath);
|
||||
v9fs_string_free(&newpath);
|
||||
if (retval < 0) {
|
||||
errno = -retval;
|
||||
retval = -1;
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int proxy_truncate(FsContext *ctx, V9fsPath *fs_path, off_t size)
|
||||
|
|
@ -514,8 +678,11 @@ static int proxy_init(FsContext *ctx)
|
|||
}
|
||||
g_free(ctx->fs_root);
|
||||
|
||||
proxy->iovec.iov_base = g_malloc(PROXY_MAX_IO_SZ + PROXY_HDR_SZ);
|
||||
proxy->iovec.iov_len = PROXY_MAX_IO_SZ + PROXY_HDR_SZ;
|
||||
proxy->in_iovec.iov_base = g_malloc(PROXY_MAX_IO_SZ + PROXY_HDR_SZ);
|
||||
proxy->in_iovec.iov_len = PROXY_MAX_IO_SZ + PROXY_HDR_SZ;
|
||||
proxy->out_iovec.iov_base = g_malloc(PROXY_MAX_IO_SZ + PROXY_HDR_SZ);
|
||||
proxy->out_iovec.iov_len = PROXY_MAX_IO_SZ + PROXY_HDR_SZ;
|
||||
|
||||
ctx->private = proxy;
|
||||
proxy->sockfd = sock_id;
|
||||
qemu_mutex_init(&proxy->mutex);
|
||||
|
|
|
|||
|
|
@ -37,8 +37,14 @@ typedef struct {
|
|||
#define PROXY_HDR_SZ (sizeof(ProxyHeader))
|
||||
|
||||
enum {
|
||||
T_OPEN = 1,
|
||||
T_SUCCESS = 0,
|
||||
T_ERROR,
|
||||
T_OPEN,
|
||||
T_CREATE,
|
||||
T_MKNOD,
|
||||
T_MKDIR,
|
||||
T_SYMLINK,
|
||||
T_LINK,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue