isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle EMLINK and EFTYPE errno values for O_NOFOLLOW failure.

Browse Source 
FreeBSD returns EMLINK and NetBSD returns EFTYPE instead of ELOOP.
This is only used to present the user with a more appropriate error
message.
This commit is contained in:
Todd C. Miller
2021-09-26 08:05:08 -06:00
parent 1d203c8344
commit 73e9256f9d
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/edit_open.c
View File

@@ -185,9 +185,21 @@ dir_is_writable(int dfd, struct sudo_cred *user_cred, struct sudo_cred *cur_cred
static int static int
sudo_edit_openat_nofollow(int dfd, char *path, int oflags, mode_t mode) sudo_edit_openat_nofollow(int dfd, char *path, int oflags, mode_t mode)
{ {
int fd;
debug_decl(sudo_edit_openat_nofollow, SUDO_DEBUG_EDIT); debug_decl(sudo_edit_openat_nofollow, SUDO_DEBUG_EDIT);
debug_return_int(openat(dfd, path, oflags|O_NOFOLLOW, mode)); fd = openat(dfd, path, oflags|O_NOFOLLOW, mode);
if (fd == -1) {
/* Handle non-standard O_NOFOLLOW errno values. */
if (errno == EMLINK)
errno = ELOOP; /* FreeBSD */
#ifdef EFTYPE
else if (errno == EFTYPE)
errno = ELOOP; /* NetBSD */
#endif
}
debug_return_int(fd);
} }
#else #else
/* /*
@@ -352,6 +364,15 @@ sudo_edit_open(char *path, int oflags, mode_t mode, int sflags,
} else { } else {
fd = open(path, oflags|O_NONBLOCK, mode); fd = open(path, oflags|O_NONBLOCK, mode);
} }
if (fd == -1 && ISSET(oflags, O_NOFOLLOW)) {
/* Handle non-standard O_NOFOLLOW errno values. */
if (errno == EMLINK)
errno = ELOOP; /* FreeBSD */
#ifdef EFTYPE
else if (errno == EFTYPE)
errno = ELOOP; /* NetBSD */
#endif
}
if (fd != -1 && !ISSET(oflags, O_NONBLOCK)) if (fd != -1 && !ISSET(oflags, O_NONBLOCK))
(void) fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NONBLOCK); (void) fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NONBLOCK);
debug_return_int(fd); debug_return_int(fd);