[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 for-2.8 5/7] 9pfs: xattrcreate requires non-opened
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL v2 for-2.8 5/7] 9pfs: xattrcreate requires non-opened fids |
Date: |
Tue, 1 Nov 2016 13:00:54 +0100 |
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 <address@hidden>
---
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 27af0072599a..547f3b558079 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);
--
2.5.5
- [Qemu-devel] [PULL v2 for-2.8 0/7] 9p patches for 2.8 20161030, Greg Kurz, 2016/11/01
- [Qemu-devel] [PULL v2 for-2.8 1/7] 9pfs: add xattrwalk_fid field in V9fsXattr struct, Greg Kurz, 2016/11/01
- [Qemu-devel] [PULL v2 for-2.8 5/7] 9pfs: xattrcreate requires non-opened fids,
Greg Kurz <=
- [Qemu-devel] [PULL v2 for-2.8 3/7] 9pfs: fix integer overflow issue in xattr read/write, Greg Kurz, 2016/11/01
- [Qemu-devel] [PULL v2 for-2.8 2/7] 9pfs: convert 'len/copied_len' field in V9fsXattr to the type of uint64_t, Greg Kurz, 2016/11/01
- [Qemu-devel] [PULL v2 for-2.8 7/7] 9pfs: drop excessive error message from virtfs_reset(), Greg Kurz, 2016/11/01
- [Qemu-devel] [PULL v2 for-2.8 4/7] 9pfs: limit xattr size in xattrcreate, Greg Kurz, 2016/11/01
- [Qemu-devel] [PULL v2 for-2.8 6/7] 9pfs: don't BUG_ON() if fid is already opened, Greg Kurz, 2016/11/01
- Re: [Qemu-devel] [PULL v2 for-2.8 0/7] 9p patches for 2.8 20161030, Peter Maydell, 2016/11/01