morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

fd-util: do not block O_TMPFILE with -EISDIR (#39736)

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-15 10:01:19 +09:00
committed by GitHub
parent 89fdab0475 0cb7dd5b96
commit c7b31a64ee
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -978,7 +978,10 @@ int fd_vet_accmode(int fd, int mode) {
if (flags < 0)
return -errno;
if (FLAGS_SET(flags, O_DIRECTORY))
/* O_TMPFILE in userspace is defined with O_DIRECTORY OR'ed in, so explicitly permit it.
*
* C.f. https://elixir.bootlin.com/linux/v6.17.7/source/include/uapi/asm-generic/fcntl.h#L92 */
if (FLAGS_SET(flags, O_DIRECTORY) && !FLAGS_SET(flags, O_TMPFILE))
return -EISDIR;
if (FLAGS_SET(flags, O_PATH))

4
src/basic/fs-util.c
View File

@@ -868,10 +868,8 @@ int open_parent_at(int dir_fd, const char *path, int flags, mode_t mode) {
/* Let's insist on O_DIRECTORY since the parent of a file or directory is a directory. Except if we open an
* O_TMPFILE file, because in that case we are actually create a regular file below the parent directory. */
if (FLAGS_SET(flags, O_PATH))
if (!FLAGS_SET(flags, O_TMPFILE))
flags |= O_DIRECTORY;
else if (!FLAGS_SET(flags, O_TMPFILE))
flags |= O_DIRECTORY|O_RDONLY;
return RET_NERRNO(openat(dir_fd, parent, flags, mode));
}