From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
Richard Henderson <richard.henderson@linaro.org>
Cc: Greg Kurz <groug@kaod.org>,
Akihiko Odaki <akihiko.odaki@gmail.com>,
Will Cohen <wwcohen@gmail.com>
Subject: [PULL v2 6/7] 9pfs: fix removing non-existent POSIX ACL xattr on macOS host
Date: Sun, 01 May 2022 15:10:16 +0200 [thread overview]
Message-ID: <9ea3164611a63e898a979f2da24caa1abd29d906.1651410615.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1651410615.git.qemu_oss@crudebyte.com>
When mapped POSIX ACL is used, we are ignoring errors when trying
to remove a POSIX ACL xattr that does not exist. On Linux hosts we
would get ENODATA in such cases, on macOS hosts however we get
ENOATTR instead.
As we can be sure that ENOATTR is defined as being identical on Linux
hosts (at least by qemu/xattr.h), it is safe to fix this issue by
simply comparing against ENOATTR instead of ENODATA.
This patch fixes e.g. a command on Linux guest like:
cp --preserve=mode old new
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Link: https://lore.kernel.org/qemu-devel/2866993.yOYK24bMf6@silver/
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id: <34f81e9bffd7a3e65fb7aab5b56c107bd0aac960.1651228001.git.qemu_oss@crudebyte.com>
---
hw/9pfs/9p-posix-acl.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/9pfs/9p-posix-acl.c b/hw/9pfs/9p-posix-acl.c
index eadae270dd..4b2cb3c66c 100644
--- a/hw/9pfs/9p-posix-acl.c
+++ b/hw/9pfs/9p-posix-acl.c
@@ -65,7 +65,11 @@ static int mp_pacl_removexattr(FsContext *ctx,
int ret;
ret = local_removexattr_nofollow(ctx, path, MAP_ACL_ACCESS);
- if (ret == -1 && errno == ENODATA) {
+ /*
+ * macOS returns ENOATTR (!=ENODATA on macOS), whereas Linux returns
+ * ENODATA (==ENOATTR on Linux), so checking for ENOATTR is fine
+ */
+ if (ret == -1 && errno == ENOATTR) {
/*
* We don't get ENODATA error when trying to remove a
* posix acl that is not present. So don't throw the error
@@ -115,7 +119,11 @@ static int mp_dacl_removexattr(FsContext *ctx,
int ret;
ret = local_removexattr_nofollow(ctx, path, MAP_ACL_DEFAULT);
- if (ret == -1 && errno == ENODATA) {
+ /*
+ * macOS returns ENOATTR (!=ENODATA on macOS), whereas Linux returns
+ * ENODATA (==ENOATTR on Linux), so checking for ENOATTR is fine
+ */
+ if (ret == -1 && errno == ENOATTR) {
/*
* We don't get ENODATA error when trying to remove a
* posix acl that is not present. So don't throw the error
--
2.30.2
next prev parent reply other threads:[~2022-05-01 13:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-01 13:10 [PULL v2 0/7] 9p queue 2022-05-01 (previous 2022-04-30) Christian Schoenebeck
2022-05-01 13:10 ` [PULL v2 3/7] 9pfs: fix qemu_mknodat(S_IFSOCK) on macOS Christian Schoenebeck
2022-05-01 13:10 ` [PULL v2 2/7] 9pfs: fix qemu_mknodat(S_IFREG) " Christian Schoenebeck
2022-05-01 13:10 ` Christian Schoenebeck [this message]
2022-05-01 13:10 ` [PULL v2 1/7] 9pfs: fix inode sequencing in 'synth' driver Christian Schoenebeck
2022-05-01 13:10 ` [PULL v2 7/7] 9pfs: fix qemu_mknodat() to always return -1 on error on macOS host Christian Schoenebeck
2022-05-01 13:10 ` [PULL v2 5/7] 9pfs: fix wrong errno being sent to Linux client " Christian Schoenebeck
2022-05-01 13:10 ` [PULL v2 4/7] 9pfs: fix wrong encoding of rdev field in Rgetattr on macOS Christian Schoenebeck
2022-05-01 16:52 ` [PULL v2 0/7] 9p queue 2022-05-01 (previous 2022-04-30) Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9ea3164611a63e898a979f2da24caa1abd29d906.1651410615.git.qemu_oss@crudebyte.com \
--to=qemu_oss@crudebyte.com \
--cc=akihiko.odaki@gmail.com \
--cc=groug@kaod.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=wwcohen@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).