From: "Christian Göttsche" <cgzones@googlemail.com>
To: selinux@vger.kernel.org
Subject: [PATCH v2] libselinux: set errno to EBADF on O_PATH emulation ENOENT failure
Date: Wed, 6 Jul 2022 13:38:04 +0200 [thread overview]
Message-ID: <20220706113804.8272-1-cgzones@googlemail.com> (raw)
In-Reply-To: <20220706104729.14975-1-cgzones@googlemail.com>
When the O_PATH emulation fails due to getxattr(2)/setxattr(2) failing
with ENOENT, e.g. because no procfs being available, override the errno
value to EBADF. This avoids confusion to the caller as it would suggest
the target of the operation does not exist, which is not the case:
setfiles: Could not set context for /: No such file or directory
Fixes: a782abf2 ("libselinux: emulate O_PATH support in fgetfilecon/fsetfilecon")
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
v2:
only override errno on ENOENT
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libselinux/src/fgetfilecon.c | 5 ++++-
libselinux/src/fsetfilecon.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libselinux/src/fgetfilecon.c b/libselinux/src/fgetfilecon.c
index baf38ec1..d7051171 100644
--- a/libselinux/src/fgetfilecon.c
+++ b/libselinux/src/fgetfilecon.c
@@ -26,7 +26,10 @@ static ssize_t fgetxattr_wrapper(int fd, const char *name, void *value, size_t s
snprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd);
errno = saved_errno;
- return getxattr(buf, name, value, size);
+ ret = getxattr(buf, name, value, size);
+ if (ret < 0 && errno == ENOENT)
+ errno = EBADF;
+ return ret;
}
int fgetfilecon_raw(int fd, char ** context)
diff --git a/libselinux/src/fsetfilecon.c b/libselinux/src/fsetfilecon.c
index be821c7a..19ea15b7 100644
--- a/libselinux/src/fsetfilecon.c
+++ b/libselinux/src/fsetfilecon.c
@@ -25,7 +25,10 @@ static int fsetxattr_wrapper(int fd, const char* name, const void* value, size_t
snprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd);
errno = saved_errno;
- return setxattr(buf, name, value, size, flags);
+ rc = setxattr(buf, name, value, size, flags);
+ if (rc < 0 && errno == ENOENT)
+ errno = EBADF;
+ return rc;
}
int fsetfilecon_raw(int fd, const char * context)
--
2.36.1
next prev parent reply other threads:[~2022-07-06 11:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 10:47 [PATCH] libselinux: set errno to EBADF on O_PATH emulation failure Christian Göttsche
2022-07-06 11:38 ` Christian Göttsche [this message]
2022-07-07 17:44 ` [PATCH v2] libselinux: set errno to EBADF on O_PATH emulation ENOENT failure James Carter
2022-08-09 15:18 ` James Carter
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=20220706113804.8272-1-cgzones@googlemail.com \
--to=cgzones@googlemail.com \
--cc=selinux@vger.kernel.org \
/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