diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index 4d6d01cd99..430db0c879 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -808,6 +808,18 @@ int fd_reopen_condition( return new_fd; } +int fd_is_opath(int fd) { + int r; + + assert(fd >= 0); + + r = fcntl(fd, F_GETFL); + if (r < 0) + return -errno; + + return FLAGS_SET(r, O_PATH); +} + int read_nr_open(void) { _cleanup_free_ char *nr_open = NULL; int r; diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h index 952afdd64f..f5357860f5 100644 --- a/src/basic/fd-util.h +++ b/src/basic/fd-util.h @@ -104,6 +104,7 @@ static inline int make_null_stdio(void) { int fd_reopen(int fd, int flags); int fd_reopen_condition(int fd, int flags, int mask, int *ret_new_fd); +int fd_is_opath(int fd); int read_nr_open(void); int fd_get_diskseq(int fd, uint64_t *ret); diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c index 746e9f369e..b42bf68f58 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -330,8 +330,14 @@ int xsetxattr(int fd, if (fd == AT_FDCWD) /* Both unspecified? Then operate on current working directory */ path = "."; - else + else { + r = fd_is_opath(fd); + if (r < 0) + return r; + + by_procfs = r; path = NULL; + } } else if (fd != AT_FDCWD) { @@ -345,25 +351,14 @@ int xsetxattr(int fd, by_procfs = true; /* fsetxattr() is not going to work, go via /proc/ link right-away */ } - for (;;) { - if (path) - r = FLAGS_SET(flags, AT_SYMLINK_FOLLOW) ? setxattr(path, name, value, size, 0) - : lsetxattr(path, name, value, size, 0); - else - r = by_procfs ? setxattr(FORMAT_PROC_FD_PATH(fd), name, value, size, 0) - : fsetxattr(fd, name, value, size, 0); - if (r < 0) { - if (errno == EBADF) { - if (by_procfs || path) - return -EBADF; + if (path) + r = FLAGS_SET(flags, AT_SYMLINK_FOLLOW) ? setxattr(path, name, value, size, 0) + : lsetxattr(path, name, value, size, 0); + else + r = by_procfs ? setxattr(FORMAT_PROC_FD_PATH(fd), name, value, size, 0) + : fsetxattr(fd, name, value, size, 0); + if (r < 0) + return -errno; - by_procfs = true; /* Might be an O_PATH fd, try again via /proc/ link */ - continue; - } - - return -errno; - } - - return 0; - } + return 0; } diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index 04d23ef09b..85901c9a49 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-xattr-util.c @@ -10,30 +10,29 @@ #include "fd-util.h" #include "fs-util.h" #include "macro.h" +#include "rm-rf.h" #include "string-util.h" #include "tests.h" #include "tmpfile-util.h" #include "xattr-util.h" TEST(getxattr_at_malloc) { - char t[] = "/var/tmp/xattrtestXXXXXX"; + _cleanup_(rm_rf_physical_and_freep) char *t = NULL; _cleanup_free_ char *value = NULL; _cleanup_close_ int fd = -EBADF; const char *x; int r; - assert_se(mkdtemp(t)); + fd = mkdtemp_open("/var/tmp/test-xattrtestXXXXXX", O_RDONLY|O_NOCTTY, &t); + assert_se(fd >= 0); x = strjoina(t, "/test"); assert_se(touch(x) >= 0); r = setxattr(x, "user.foo", "bar", 3, 0); - if (r < 0 && ERRNO_IS_NOT_SUPPORTED(errno)) /* no xattrs supported on /var/tmp... */ - goto cleanup; + if (r < 0 && ERRNO_IS_NOT_SUPPORTED(errno)) + return (void) log_tests_skipped_errno(errno, "no xattrs supported on /var/tmp"); assert_se(r >= 0); - fd = open(t, O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY); - assert_se(fd >= 0); - assert_se(getxattr_at_malloc(fd, "test", "user.foo", 0, &value) == 3); assert_se(memcmp(value, "bar", 3) == 0); value = mfree(value); @@ -53,21 +52,15 @@ TEST(getxattr_at_malloc) { assert_se(fd >= 0); assert_se(getxattr_at_malloc(fd, NULL, "user.foo", 0, &value) == 3); assert_se(streq(value, "bar")); - -cleanup: - assert_se(unlink(x) >= 0); - assert_se(rmdir(t) >= 0); } TEST(getcrtime) { + _cleanup_(rm_rf_physical_and_freep) char *t = NULL; _cleanup_close_ int fd = -EBADF; - const char *vt; usec_t usec, k; int r; - assert_se(var_tmp_dir(&vt) >= 0); - - fd = open_tmpfile_unlinkable(vt, O_RDWR); + fd = mkdtemp_open("/var/tmp/test-xattrtestXXXXXX", 0, &t); assert_se(fd >= 0); r = fd_getcrtime(fd, &usec); @@ -86,4 +79,51 @@ TEST(getcrtime) { } } +static void verify_xattr(int dfd, const char *expected) { + _cleanup_free_ char *value = NULL; + + assert_se(getxattr_at_malloc(dfd, "test", "user.foo", 0, &value) == (int) strlen(expected)); + assert_se(streq(value, expected)); +} + +TEST(xsetxattr) { + _cleanup_(rm_rf_physical_and_freep) char *t = NULL; + _cleanup_close_ int dfd = -EBADF, fd = -EBADF; + const char *x; + int r; + + dfd = mkdtemp_open("/var/tmp/test-xattrtestXXXXXX", O_PATH, &t); + assert_se(dfd >= 0); + x = strjoina(t, "/test"); + assert_se(touch(x) >= 0); + + /* by full path */ + r = xsetxattr(AT_FDCWD, x, "user.foo", "fullpath", SIZE_MAX, 0); + if (r < 0 && ERRNO_IS_NOT_SUPPORTED(r)) + return (void) log_tests_skipped_errno(r, "no xattrs supported on /var/tmp"); + assert_se(r >= 0); + verify_xattr(dfd, "fullpath"); + + /* by dirfd */ + assert_se(xsetxattr(dfd, "test", "user.foo", "dirfd", SIZE_MAX, 0) >= 0); + verify_xattr(dfd, "dirfd"); + + /* by fd (O_PATH) */ + fd = openat(dfd, "test", O_PATH|O_CLOEXEC); + assert_se(fd >= 0); + assert_se(xsetxattr(fd, NULL, "user.foo", "fd_opath", SIZE_MAX, 0) >= 0); + verify_xattr(dfd, "fd_opath"); + assert_se(xsetxattr(fd, "", "user.foo", "fd_opath", SIZE_MAX, 0) == -EINVAL); + assert_se(xsetxattr(fd, "", "user.foo", "fd_opath_empty", SIZE_MAX, AT_EMPTY_PATH) >= 0); + verify_xattr(dfd, "fd_opath_empty"); + fd = safe_close(fd); + + fd = openat(dfd, "test", O_RDONLY|O_CLOEXEC); + assert_se(xsetxattr(fd, NULL, "user.foo", "fd_regular", SIZE_MAX, 0) >= 0); + verify_xattr(dfd, "fd_regular"); + assert_se(xsetxattr(fd, "", "user.foo", "fd_regular_empty", SIZE_MAX, 0) == -EINVAL); + assert_se(xsetxattr(fd, "", "user.foo", "fd_regular_empty", SIZE_MAX, AT_EMPTY_PATH) >= 0); + verify_xattr(dfd, "fd_regular_empty"); +} + DEFINE_TEST_MAIN(LOG_DEBUG);