shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-09 13:57:42 +03:00
Code

Merge pull request #27060 from yuwata/fd-get-path

Browse Source 
fd-util: make fd_get_path() support AT_FDCWD
This commit is contained in:
Daan De Meyer 2023-03-30 07:59:25 +02:00 committed by GitHub
commit 2e82d82445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 122 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/fd-util.c
View File

@ -534,6 +534,11 @@ bool fdname_is_valid(const char *s) {
int fd_get_path(int fd, char **ret) {
int r;
assert(fd >= 0 || fd == AT_FDCWD);
if (fd == AT_FDCWD)
return safe_getcwd(ret);
r = readlink_malloc(FORMAT_PROC_FD_PATH(fd), ret);
if (r == -ENOENT) {
/* ENOENT can mean two things: that the fd does not exist or that /proc is not mounted. Let's make

117
src/test/test-fd-util.c
View File

@ -9,6 +9,7 @@
#include "data-fd-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
#include "macro.h"
#include "memory-util.h"
#include "missing_syscall.h"
@ -633,4 +634,120 @@ TEST(dir_fd_is_root) {
assert_se(dir_fd_is_root(fd) == 0);
}
TEST(fd_get_path) {
_cleanup_(rm_rf_physical_and_freep) char *t = NULL;
_cleanup_close_ int tfd = -EBADF, fd = -EBADF;
_cleanup_free_ char *p = NULL, *q = NULL, *saved_cwd = NULL;
tfd = mkdtemp_open(NULL, O_PATH, &t);
assert_se(tfd >= 0);
assert_se(fd_get_path(tfd, &p) >= 0);
assert_se(streq(p, t));
p = mfree(p);
assert_se(safe_getcwd(&saved_cwd) >= 0);
assert_se(chdir(t) >= 0);
assert_se(fd_get_path(AT_FDCWD, &p) >= 0);
assert_se(streq(p, t));
p = mfree(p);
assert_se(q = path_join(t, "regular"));
assert_se(touch(q) >= 0);
assert_se(mkdirat_parents(tfd, "subdir/symlink", 0755) >= 0);
assert_se(symlinkat("../regular", tfd, "subdir/symlink") >= 0);
assert_se(symlinkat("subdir", tfd, "symdir") >= 0);
fd = openat(tfd, "regular", O_CLOEXEC|O_PATH);
assert_se(fd >= 0);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(AT_FDCWD, "regular", O_CLOEXEC|O_PATH);
assert_se(fd >= 0);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(tfd, "subdir/symlink", O_CLOEXEC|O_PATH);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) >= 0);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(AT_FDCWD, "subdir/symlink", O_CLOEXEC|O_PATH);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) >= 0);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(tfd, "symdir//./symlink", O_CLOEXEC|O_PATH);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) >= 0);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(AT_FDCWD, "symdir//./symlink", O_CLOEXEC|O_PATH);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) >= 0);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
q = mfree(q);
fd = safe_close(fd);
assert_se(q = path_join(t, "subdir/symlink"));
fd = openat(tfd, "subdir/symlink", O_CLOEXEC|O_PATH|O_NOFOLLOW);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) == -ELOOP);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(AT_FDCWD, "subdir/symlink", O_CLOEXEC|O_PATH|O_NOFOLLOW);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) == -ELOOP);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(tfd, "symdir//./symlink", O_CLOEXEC|O_PATH|O_NOFOLLOW);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) == -ELOOP);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
p = mfree(p);
fd = safe_close(fd);
fd = openat(AT_FDCWD, "symdir//./symlink", O_CLOEXEC|O_PATH|O_NOFOLLOW);
assert_se(fd >= 0);
assert_se(fd_verify_regular(fd) == -ELOOP);
assert_se(fd_get_path(fd, &p) >= 0);
assert_se(streq(p, q));
assert_se(chdir(saved_cwd) >= 0);
}
DEFINE_TEST_MAIN(LOG_DEBUG);