Merge pull request #3900 from brauner/2021-07-08.fixes

file_utils: surface ENOENT when falling back to openat()

Merge pull request #3900 from brauner/2021-07-08.fixes
68963bec · Stéphane Graber · GitHub · 78598e2b · ebb79ad3 · 68963bec
Unverified Commit 68963bec authored Jul 08, 2021 by Stéphane Graber Committed by GitHub Jul 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

file_utils.c src/lxc/file_utils.c +5 -1

No files found.
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -663,7 +663,11 @@ int open_at(int dfd, const char *path, unsigned int o_flags,
 	if (errno != ENOSYS)
 		return -errno;

-	return openat(dfd, path, o_flags, mode);
+	fd = openat(dfd, path, o_flags, mode);
+	if (fd < 0)
+		return -errno;
+
+	return move_fd(fd);
 }

 int fd_make_nonblocking(int fd)