Commit a674da0a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging 



Mostly bug fixes and code sanitization motivated by the upcoming
support for Darwin hosts. Thanks to Keno Fischer.

# gpg: Signature made Thu 07 Jun 2018 11:30:56 BST
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  9p: xattr: Properly translate xattrcreate flags
  9p: Properly check/translate flags in unlinkat
  9p: local: Avoid warning if FS_IOC_GETVERSION is not defined
  9p: xattr: Fix crashes due to free of uninitialized value
  9p: Move a couple xattr functions to 9p-util
  9p: local: Properly set errp in fstatfs error path
  9p: proxy: Fix size passed to `connect`

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8e36d27c aca6897f

hw/9pfs/9p-handle.c

+1 −7
Original line number Diff line number Diff line
@@ -559,19 +559,13 @@ static int handle_unlinkat(FsContext *ctx, V9fsPath *dir, 
{

    int dirfd, ret;

    HandleData *data = (HandleData *) ctx->private;

    int rflags;



    dirfd = open_by_handle(data->mountfd, dir->data, O_PATH);

    if (dirfd < 0) {

        return dirfd;

    }



    rflags = 0;

    if (flags & P9_DOTL_AT_REMOVEDIR) {

        rflags |= AT_REMOVEDIR;

    }



    ret = unlinkat(dirfd, name, rflags);

    ret = unlinkat(dirfd, name, flags);



    close(dirfd);

    return ret;

hw/9pfs/9p-local.c

+24 −16
Original line number Diff line number Diff line
@@ -1373,10 +1373,10 @@ static int local_unlinkat(FsContext *ctx, V9fsPath *dir, 
    return ret;

}



#ifdef FS_IOC_GETVERSION

static int local_ioc_getversion(FsContext *ctx, V9fsPath *path,

                                mode_t st_mode, uint64_t *st_gen)

{

#ifdef FS_IOC_GETVERSION

    int err;

    V9fsFidOpenState fid_open;
@@ -1395,30 +1395,21 @@ static int local_ioc_getversion(FsContext *ctx, V9fsPath *path, 
    err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen);

    local_close(ctx, &fid_open);

    return err;

#else

    errno = ENOTTY;

    return -1;

#endif

}

#endif



static int local_init(FsContext *ctx, Error **errp)

static int local_ioc_getversion_init(FsContext *ctx, LocalData *data, Error **errp)

{

#ifdef FS_IOC_GETVERSION

    struct statfs stbuf;

    LocalData *data = g_malloc(sizeof(*data));



    data->mountfd = open(ctx->fs_root, O_DIRECTORY | O_RDONLY);

    if (data->mountfd == -1) {

        error_setg_errno(errp, errno, "failed to open '%s'", ctx->fs_root);

        goto err;

    }



#ifdef FS_IOC_GETVERSION

    /*

     * use ioc_getversion only if the ioctl is definied

     */

    if (fstatfs(data->mountfd, &stbuf) < 0) {

        close_preserve_errno(data->mountfd);

        goto err;

        error_setg_errno(errp, errno,

                         "failed to stat file system at '%s'", ctx->fs_root);

        return -1;

    }

    switch (stbuf.f_type) {

    case EXT2_SUPER_MAGIC:
@@ -1429,6 +1420,23 @@ static int local_init(FsContext *ctx, Error **errp) 
        break;

    }

#endif

    return 0;

}



static int local_init(FsContext *ctx, Error **errp)

{

    LocalData *data = g_malloc(sizeof(*data));



    data->mountfd = open(ctx->fs_root, O_DIRECTORY | O_RDONLY);

    if (data->mountfd == -1) {

        error_setg_errno(errp, errno, "failed to open '%s'", ctx->fs_root);

        goto err;

    }



    if (local_ioc_getversion_init(ctx, data, errp) < 0) {

        close(data->mountfd);

        goto err;

    }



    if (ctx->export_flags & V9FS_SM_PASSTHROUGH) {

        ctx->xops = passthrough_xattr_ops;

hw/9pfs/9p-proxy.c

+2 −3
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ static int proxy_ioc_getversion(FsContext *fs_ctx, V9fsPath *path, 


static int connect_namedsocket(const char *path, Error **errp)

{

    int sockfd, size;

    int sockfd;

    struct sockaddr_un helper;



    if (strlen(path) >= sizeof(helper.sun_path)) {
@@ -1102,8 +1102,7 @@ static int connect_namedsocket(const char *path, Error **errp) 
    }

    strcpy(helper.sun_path, path);

    helper.sun_family = AF_UNIX;

    size = strlen(helper.sun_path) + sizeof(helper.sun_family);

    if (connect(sockfd, (struct sockaddr *)&helper, size) < 0) {

    if (connect(sockfd, (struct sockaddr *)&helper, sizeof(helper)) < 0) {

        error_setg_errno(errp, errno, "failed to connect to '%s'", path);

        close(sockfd);

        return -1;

hw/9pfs/9p-util.c

+33 −0
Original line number Diff line number Diff line
@@ -24,3 +24,36 @@ ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name, 
    g_free(proc_path);

    return ret;

}



ssize_t flistxattrat_nofollow(int dirfd, const char *filename,

                              char *list, size_t size)

{

    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename);

    int ret;



    ret = llistxattr(proc_path, list, size);

    g_free(proc_path);

    return ret;

}



ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,

                                const char *name)

{

    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename);

    int ret;



    ret = lremovexattr(proc_path, name);

    g_free(proc_path);

    return ret;

}



int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name,

                         void *value, size_t size, int flags)

{

    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename);

    int ret;



    ret = lsetxattr(proc_path, name, value, size, flags);

    g_free(proc_path);

    return ret;

}

hw/9pfs/9p-util.h

+4 −0
Original line number Diff line number Diff line
@@ -60,5 +60,9 @@ ssize_t fgetxattrat_nofollow(int dirfd, const char *path, const char *name, 
                             void *value, size_t size);

int fsetxattrat_nofollow(int dirfd, const char *path, const char *name,

                         void *value, size_t size, int flags);

ssize_t flistxattrat_nofollow(int dirfd, const char *filename,

                              char *list, size_t size);

ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,

                                const char *name);



#endif