make fchdir, fchmod, fchown, and fstat support O_PATH file descriptors

on newer kernels, fchdir and fstat work anyway. this same fix should
be applied to any other syscalls that are similarly affected.

with this change, the current definitions of O_SEARCH and O_EXEC as
O_PATH are mostly conforming to POSIX requirements. the main remaining
issue is that O_NOFOLLOW has different semantics.

diff --git a/src/stat/fchmod.c b/src/stat/fchmod.c
index f9b99366e4790b01b1f94f460e657fc9439cd9cc..1b943d440c547dfd81e7269e9d70710bdefc2770 100644 (file)
--- a/src/stat/fchmod.c
+++ b/src/stat/fchmod.c
@@ -1,7 +1,15 @@
 #include <sys/stat.h>
+#include <errno.h>
 #include "syscall.h"
 
+void __procfdname(char *, unsigned);
+
 int fchmod(int fd, mode_t mode)
 {
-       return syscall(SYS_fchmod, fd, mode);
+       int ret = __syscall(SYS_fchmod, fd, mode);
+       if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+
+       char buf[15+3*sizeof(int)];
+       __procfdname(buf, fd);
+       return syscall(SYS_chmod, buf, mode);
 }

diff --git a/src/stat/fstat.c b/src/stat/fstat.c
index 10228f75240c9b38dfadc101125cc03f07780697..29b4243db37307c27c65601ef84fa16177ef669f 100644 (file)
--- a/src/stat/fstat.c
+++ b/src/stat/fstat.c
@@ -1,10 +1,18 @@
 #include <sys/stat.h>
+#include <errno.h>
 #include "syscall.h"
 #include "libc.h"
 
-int fstat(int fd, struct stat *buf)
+void __procfdname(char *, unsigned);
+
+int fstat(int fd, struct stat *st)
 {
-       return syscall(SYS_fstat, fd, buf);
+       int ret = __syscall(SYS_fstat, fd, st);
+       if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+
+       char buf[15+3*sizeof(int)];
+       __procfdname(buf, fd);
+       return syscall(SYS_stat, buf, st);
 }
 
 LFS64(fstat);

diff --git a/src/unistd/fchdir.c b/src/unistd/fchdir.c
index e5595f7749f35f0d959da1fc186e6361e648e90d..9fbc815429e43973311b3cab56ab298224ec1b0a 100644 (file)
--- a/src/unistd/fchdir.c
+++ b/src/unistd/fchdir.c
@@ -1,7 +1,15 @@
 #include <unistd.h>
+#include <errno.h>
 #include "syscall.h"
 
+void __procfdname(char *, unsigned);
+
 int fchdir(int fd)
 {
-       return syscall(SYS_fchdir, fd);
+       int ret = __syscall(SYS_fchdir, fd);
+       if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+
+       char buf[15+3*sizeof(int)];
+       __procfdname(buf, fd);
+       return syscall(SYS_chdir, buf);
 }

diff --git a/src/unistd/fchown.c b/src/unistd/fchown.c
index b05f0be41d9dae32dfd6c82ba96c364fd2606eaf..e1c3198a738cd2cb46f52f13f78892b81b6ab483 100644 (file)
--- a/src/unistd/fchown.c
+++ b/src/unistd/fchown.c
@@ -1,7 +1,15 @@
 #include <unistd.h>
+#include <errno.h>
 #include "syscall.h"
 
+void __procfdname(char *, unsigned);
+
 int fchown(int fd, uid_t uid, gid_t gid)
 {
-       return syscall(SYS_fchown, fd, uid, gid);
+       int ret = __syscall(SYS_fchown, fd, uid, gid);
+       if (ret != -EBADF || fd < 0) return __syscall_ret(ret);
+
+       char buf[15+3*sizeof(int)];
+       __procfdname(buf, fd);
+       return syscall(SYS_chown, buf, uid, gid);
 }