libselinux: set errno to EBADF on O_PATH emulation failure
PATCH 1/1 libselinux: set errno to EBADF on O_PATH emulation failure
When the O_PATH emulation fails override the errno value to EBADF instead of retaining the one from getxattr(2)/setxattr(2).
For example in the case of no procfs being mounted, e.g. inside of a chroot, getxattr(2)/setxattr(2) fail with ENOENT. This is confusing to the caller as it seems the target of the operation does not exist, which is not the case:
setfiles: Could not set context for /: No such file or directory
--- libselinux/src/fgetfilecon.c | 8 +++++--- libselinux/src/fsetfilecon.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-)
libselinux/src/fgetfilecon.c +5 -3
@@ -10,7 +10,7 @@static ssize_t fgetxattr_wrapper (int fd,const char *name,void *value,size_t size) {char buf[40 ]; -int fd_flag, saved_errno = errno; +int fd_flag;ssize_t ret; ret =fgetxattr (fd, name, value, size);
@@ -25,8 +25,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 =EBADF ; +return ret; }int fgetfilecon_raw (int fd,char ** context)
libselinux/src/fsetfilecon.c +5 -3
@@ -10,7 +10,7 @@static int fsetxattr_wrapper (int fd,const char * name,const void * value,size_t size,int flags) {char buf[40 ]; -int rc, fd_flag, saved_errno = errno; +int rc, fd_flag; rc =fsetxattr (fd, name, value, size, flags);if (rc ==0 || errno !=EBADF )
@@ -24,8 +24,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 =EBADF ; +return rc; }int fsetfilecon_raw (int fd,const char * context)
Signature · 1 line
2.36.1
PATCH v2 1/1 libselinux: set errno to EBADF on O_PATH emulation ENOENT failure
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
---
v2:
only override errno on ENOENT
--- libselinux/src/fgetfilecon.c | 5 ++++- libselinux/src/fsetfilecon.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
libselinux/src/fgetfilecon.c +4 -1
@@ -26,7 +26,10 @@ static ssize_t fgetxattr_wrapper(int fd, const char *name, void *value, size_t ssnprintf (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)
libselinux/src/fsetfilecon.c +4 -1
@@ -25,7 +25,10 @@ static int fsetxattr_wrapper(int fd, const char* name, const void* value, size_tsnprintf (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)
Signature · 1 line
2.36.1
Re: [PATCH v2] libselinux: set errno to EBADF on O_PATH emulation ENOENT failure
Quoted 10 lines · Christian Göttsche
When the
O_PATHemulation 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 <[email protected]>
Quoted 44 lines
---
v2:
only override errno on ENOENTSigned-off-by Christian Göttsche <[email protected]>--- libselinux/src/fgetfilecon.c | 5 ++++- libselinux/src/fsetfilecon.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)libselinux/src/fgetfilecon.c +4
-1@@ -26,7 +26,10 @@ static ssize_t fgetxattr_wrapper(int fd, const char *name, void *value, size_t ssnprintf (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)libselinux/src/fsetfilecon.c +4
-2@@ -25,7 +25,10 @@ static int fsetxattr_wrapper(int fd, const char* name, const void* value, size_tsnprintf (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
Re: [PATCH v2] libselinux: set errno to EBADF on O_PATH emulation ENOENT failure
Quoted 9 lines · James Carter
Quoted 6 lines · Christian Göttsche
When the
O_PATHemulation 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:
Quoted 7 lines
Quoted 4 lines
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 <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 44 lines
Quoted 44 lines
---
v2:
only override errno on ENOENTSigned-off-by Christian Göttsche <[email protected]>--- libselinux/src/fgetfilecon.c | 5 ++++- libselinux/src/fsetfilecon.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)libselinux/src/fgetfilecon.c +4
-1@@ -26,7 +26,10 @@ static ssize_t fgetxattr_wrapper(int fd, const char *name, void *value, size_t ssnprintf (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)libselinux/src/fsetfilecon.c +4
-2@@ -25,7 +25,10 @@ static int fsetxattr_wrapper(int fd, const char* name, const void* value, size_tsnprintf (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