[Xen-changelog] [qemu-xen master] 9pfs: xattrcreate requires non-opened fids

[patchbot@xxxxxxx]

commit dd654e0365c7b70df01920f1fca88dd7089eeb5d
Author:     Greg Kurz <groug@xxxxxxxx>
AuthorDate: Tue Nov 1 12:00:40 2016 +0100
Commit:     Greg Kurz <groug@xxxxxxxx>
CommitDate: Tue Nov 1 12:03:02 2016 +0100

    9pfs: xattrcreate requires non-opened fids
    
    The xattrcreate operation only makes sense on a freshly cloned fid
    actually, since any open state would be leaked because of the fid_type
    change. This is indeed what the linux kernel client does:
    
        fid = clone_fid(fid);
        [...]
        retval = p9_client_xattrcreate(fid, name, value_len, flags);
    
    This patch also reverts commit ff55e94d23ae since we are sure that a fid
    with type P9_FID_NONE doesn't have a previously allocated xattr.
    
    Signed-off-by: Greg Kurz <groug@xxxxxxxx>
---
 hw/9pfs/9p.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 27af007..547f3b5 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3272,6 +3272,11 @@ static void coroutine_fn v9fs_xattrcreate(void *opaque)
         err = -EINVAL;
         goto out_nofid;
     }
+    if (file_fidp->fid_type != P9_FID_NONE) {
+        err = -EINVAL;
+        goto out_put_fid;
+    }
+
     /* Make the file fid point to xattr */
     xattr_fidp = file_fidp;
     xattr_fidp->fid_type = P9_FID_XATTR;
@@ -3281,9 +3286,9 @@ static void coroutine_fn v9fs_xattrcreate(void *opaque)
     xattr_fidp->fs.xattr.flags = flags;
     v9fs_string_init(&xattr_fidp->fs.xattr.name);
     v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
-    g_free(xattr_fidp->fs.xattr.value);
     xattr_fidp->fs.xattr.value = g_malloc0(size);
     err = offset;
+out_put_fid:
     put_fid(pdu, file_fidp);
 out_nofid:
     pdu_complete(pdu, err);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog