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

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



* remotes/kvaneesh/for-upstream:
  hw/9pfs: Include virtio-9p-device.o in build
  hw/9pfs: use g_strdup_printf() instead of PATH_MAX limitation
  hw/9pfs/virtio-9p-local.c: use snprintf() instead of sprintf()
  hw/9pfs/virtio-9p-local.c: move v9fs_string_free() to below "err_out:"
  fsdev: Fix overrun after readlink() fills buffer completely

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d7c698af 993c91a0

Makefile.objs

+0 −5
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o 


block-obj-m = block/



ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)

# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.

# only pull in the actual virtio-9p device if we also enabled virtio.

CONFIG_REALLY_VIRTFS=y

endif



######################################################################

# smartcard

fsdev/Makefile.objs

+3 −1
Original line number Diff line number Diff line 
ifeq ($(CONFIG_REALLY_VIRTFS),y)

ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)

# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.

# only pull in the actual virtio-9p device if we also enabled virtio.

common-obj-y = qemu-fsdev.o virtio-9p-marshal.o

else

common-obj-y = qemu-fsdev-dummy.o

fsdev/virtfs-proxy-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static int do_readlink(struct iovec *iovec, struct iovec *out_iovec) 
    }

    buffer = g_malloc(size);

    v9fs_string_init(&target);

    retval = readlink(path.data, buffer, size);

    retval = readlink(path.data, buffer, size - 1);

    if (retval > 0) {

        buffer[retval] = '\0';

        v9fs_string_sprintf(&target, "%s", buffer);

hw/9pfs/cofs.c

+34 −14
Original line number Diff line number Diff line
@@ -17,35 +17,55 @@ 
#include "block/coroutine.h"

#include "virtio-9p-coth.h"



static ssize_t __readlink(V9fsState *s, V9fsPath *path, V9fsString *buf)

{

    ssize_t len, maxlen = PATH_MAX;



    buf->data = g_malloc(PATH_MAX);

    for(;;) {

        len = s->ops->readlink(&s->ctx, path, buf->data, maxlen);

        if (len < 0) {

            g_free(buf->data);

            buf->data = NULL;

            buf->size = 0;

            break;

        } else if (len == maxlen) {

            /*

             * We dodn't have space to put the NULL or we have more

             * to read. Increase the size and try again

             */

            maxlen *= 2;

            g_free(buf->data);

            buf->data = g_malloc(maxlen);

            continue;

        }

        /*

         * Null terminate the readlink output

         */

        buf->data[len] = '\0';

        buf->size = len;

        break;

    }

    return len;

}



int v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf)

{

    int err;

    ssize_t len;

    V9fsState *s = pdu->s;



    if (v9fs_request_cancelled(pdu)) {

        return -EINTR;

    }

    buf->data = g_malloc(PATH_MAX);

    v9fs_path_read_lock(s);

    v9fs_co_run_in_worker(

        {

            len = s->ops->readlink(&s->ctx, path,

                                   buf->data, PATH_MAX - 1);

            if (len > -1) {

                buf->size = len;

                buf->data[len] = 0;

                err = 0;

            } else {

            err = __readlink(s, path, buf);

            if (err < 0) {

                err = -errno;

            }

        });

    v9fs_path_unlock(s);

    if (err) {

        g_free(buf->data);

        buf->data = NULL;

        buf->size = 0;

    }

    return err;

}

hw/9pfs/virtio-9p-handle.c

+6 −3
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int handle_lremovexattr(FsContext *ctx, V9fsPath *fs_path, 
static int handle_name_to_path(FsContext *ctx, V9fsPath *dir_path,

                              const char *name, V9fsPath *target)

{

    char buffer[PATH_MAX];

    char *buffer;

    struct file_handle *fh;

    int dirfd, ret, mnt_id;

    struct handle_data *data = (struct handle_data *)ctx->private;
@@ -513,7 +513,9 @@ static int handle_name_to_path(FsContext *ctx, V9fsPath *dir_path, 
        dirfd = open_by_handle(data->mountfd, dir_path->data, O_PATH);

    } else {

        /* relative to export root */

        dirfd = open(rpath(ctx, ".", buffer), O_DIRECTORY);

        buffer = rpath(ctx, ".");

        dirfd = open(buffer, O_DIRECTORY);

        g_free(buffer);

    }

    if (dirfd < 0) {

        return dirfd;
@@ -521,7 +523,7 @@ static int handle_name_to_path(FsContext *ctx, V9fsPath *dir_path, 
    fh = g_malloc(sizeof(struct file_handle) + data->handle_bytes);

    fh->handle_bytes = data->handle_bytes;

    /* add a "./" at the beginning of the path */

    snprintf(buffer, PATH_MAX, "./%s", name);

    buffer = g_strdup_printf("./%s", name);

    /* flag = 0 imply don't follow symlink */

    ret = name_to_handle(dirfd, buffer, fh, &mnt_id, 0);

    if (!ret) {
@@ -531,6 +533,7 @@ static int handle_name_to_path(FsContext *ctx, V9fsPath *dir_path, 
        g_free(fh);

    }

    close(dirfd);

    g_free(buffer);

    return ret;

}