[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 06/11] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX
From: |
Will Cohen |
Subject: |
[PATCH v7 06/11] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX |
Date: |
Tue, 15 Feb 2022 14:04:21 -0500 |
From: Keno Fischer <keno@juliacomputing.com>
Signed-off-by: Keno Fischer <keno@juliacomputing.com>
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
Because XATTR_SIZE_MAX is not defined on Darwin,
create a cross-platform P9_XATTR_SIZE_MAX instead.
[Will Cohen: - Adjust coding style
- Lower XATTR_SIZE_MAX to 64k
- Add explanatory context related to XATTR_SIZE_MAX]
[Fabian Franz: - Move XATTR_SIZE_MAX reference from 9p.c to
P9_XATTR_SIZE_MAX in 9p.h]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
Signed-off-by: Fabian Franz <fabianfranz.oss@gmail.com>
[Will Cohen: - For P9_XATTR_MAX, ensure that Linux uses
XATTR_SIZE_MAX, Darwin uses 64k, and error
out for undefined hosts]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
---
hw/9pfs/9p.c | 2 +-
hw/9pfs/9p.h | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 14e84c3bcf..7405352c37 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3949,7 +3949,7 @@ static void coroutine_fn v9fs_xattrcreate(void *opaque)
rflags |= XATTR_REPLACE;
}
- if (size > XATTR_SIZE_MAX) {
+ if (size > P9_XATTR_SIZE_MAX) {
err = -E2BIG;
goto out_nofid;
}
diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index 1567b67841..94b273b3d0 100644
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -479,4 +479,22 @@ struct V9fsTransport {
void (*push_and_notify)(V9fsPDU *pdu);
};
+#if defined(XATTR_SIZE_MAX)
+/* Linux */
+#define P9_XATTR_SIZE_MAX XATTR_SIZE_MAX
+#elif defined(CONFIG_DARWIN)
+/*
+ * Darwin doesn't seem to define a maximum xattr size in its user
+ * space header, so manually configure it across platforms as 64k.
+ *
+ * Having no limit at all can lead to QEMU crashing during large g_malloc()
+ * calls. Because QEMU does not currently support macOS guests, the below
+ * preliminary solution only works due to its being a reflection of the limit
of
+ * Linux guests.
+ */
+#define P9_XATTR_SIZE_MAX 65536
+#else
+#error Missing definition for P9_XATTR_SIZE_MAX for this host system
+#endif
+
#endif
--
2.34.1
- [PATCH v7 00/11] 9p: Add support for darwin, Will Cohen, 2022/02/15
- [PATCH v7 01/11] 9p: linux: Fix a couple Linux assumptions, Will Cohen, 2022/02/15
- [PATCH v7 02/11] 9p: Rename 9p-util -> 9p-util-linux, Will Cohen, 2022/02/15
- [PATCH v7 03/11] 9p: darwin: Handle struct stat(fs) differences, Will Cohen, 2022/02/15
- [PATCH v7 04/11] 9p: darwin: Handle struct dirent differences, Will Cohen, 2022/02/15
- [PATCH v7 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT}, Will Cohen, 2022/02/15
- [PATCH v7 06/11] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX,
Will Cohen <=
- [PATCH v7 07/11] 9p: darwin: *xattr_nofollow implementations, Will Cohen, 2022/02/15
- [PATCH v7 08/11] 9p: darwin: Compatibility for f/l*xattr, Will Cohen, 2022/02/15
- [PATCH v7 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/15
- [PATCH v7 10/11] 9p: darwin: Adjust assumption on virtio-9p-test, Will Cohen, 2022/02/15
- [PATCH v7 11/11] 9p: darwin: meson: Allow VirtFS on Darwin, Will Cohen, 2022/02/15
- Re: [PATCH v7 00/11] 9p: Add support for darwin, Will Cohen, 2022/02/18