summaryrefslogtreecommitdiff
path: root/src/unistd
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-12-19 14:24:55 -0500
committerRich Felker <dalias@aerifal.cx>2013-12-19 14:24:55 -0500
commit65ea604c74f3fecbc61a266a22fdf527764995b6 (patch)
treecf4cfe75094e4301b37d0ab21f21e5c1a6a36473 /src/unistd
parentf89e29829029c5003450f7b58bd00fe5d1049d09 (diff)
downloadmusl-65ea604c74f3fecbc61a266a22fdf527764995b6.tar.gz
fix failure of fchmod, fstat, fchdir, and fchown to produce EBADF
the workaround/fallback code for supporting O_PATH file descriptors when the kernel lacks support for performing these operations on them caused EBADF to get replaced by ENOENT (due to missing entry in /proc/self/fd). this is unlikely to affect real-world code (calls that might yield EBADF are generally unsafe, especially in library code) but it was breaking some test cases. the fix I've applied is something of a tradeoff: it adds one syscall to these operations on kernels where the workaround is needed. the alternative would be to catch ENOENT from the /proc lookup and translate it to EBADF, but I want to avoid doing that in the interest of not touching/depending on /proc at all in these functions as long as the kernel correctly supports the operations. this is following the general principle of isolating hacks to code paths that are taken on broken systems, and keeping the code for correct systems completely hack-free.
Diffstat (limited to 'src/unistd')
-rw-r--r--src/unistd/fchdir.c4
-rw-r--r--src/unistd/fchown.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/unistd/fchdir.c b/src/unistd/fchdir.c
index 9fbc8154..72c3915e 100644
--- a/src/unistd/fchdir.c
+++ b/src/unistd/fchdir.c
@@ -1,5 +1,6 @@
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include "syscall.h"
void __procfdname(char *, unsigned);
@@ -7,7 +8,8 @@ void __procfdname(char *, unsigned);
int fchdir(int fd)
{
int ret = __syscall(SYS_fchdir, fd);
- if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+ if (ret != -EBADF || __syscall(SYS_fcntl, fd, F_GETFD) < 0)
+ return __syscall_ret(ret);
char buf[15+3*sizeof(int)];
__procfdname(buf, fd);
diff --git a/src/unistd/fchown.c b/src/unistd/fchown.c
index e1c3198a..36633b0e 100644
--- a/src/unistd/fchown.c
+++ b/src/unistd/fchown.c
@@ -1,5 +1,6 @@
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include "syscall.h"
void __procfdname(char *, unsigned);
@@ -7,7 +8,8 @@ void __procfdname(char *, unsigned);
int fchown(int fd, uid_t uid, gid_t gid)
{
int ret = __syscall(SYS_fchown, fd, uid, gid);
- if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+ if (ret != -EBADF || __syscall(SYS_fcntl, fd, F_GETFD) < 0)
+ return __syscall_ret(ret);
char buf[15+3*sizeof(int)];
__procfdname(buf, fd);