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

O_EXEC for fexecve() not O_SEARCH.

Browse Source
This commit is contained in:
Todd C. Miller
2018-04-25 14:55:55 -06:00
parent 95fb4458d5
commit a18e811485
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/sudoers/match.c
View File

@@ -70,8 +70,8 @@
# include "compat/fnmatch.h" # include "compat/fnmatch.h"
#endif /* HAVE_FNMATCH */ #endif /* HAVE_FNMATCH */
#if !defined(O_SEARCH) && defined(O_PATH) #if !defined(O_EXEC) && defined(O_PATH)
# define O_SEARCH O_PATH # define O_EXEC O_PATH
#endif #endif
static struct member_list empty = TAILQ_HEAD_INITIALIZER(empty); static struct member_list empty = TAILQ_HEAD_INITIALIZER(empty);
@@ -519,11 +519,11 @@ open_cmnd(const char *path, const struct sudo_digest *digest, int *fdp)
debug_return_bool(true); debug_return_bool(true);
fd = open(path, O_RDONLY|O_NONBLOCK); fd = open(path, O_RDONLY|O_NONBLOCK);
# ifdef O_SEARCH # ifdef O_EXEC
if (fd == -1 && errno == EACCES && digest == NULL) { if (fd == -1 && errno == EACCES && digest == NULL) {
/* Try again with O_SEARCH if no digest is specified. */ /* Try again with O_EXEC if no digest is specified. */
const int saved_errno = errno; const int saved_errno = errno;
if ((fd = open(path, O_SEARCH)) == -1) if ((fd = open(path, O_EXEC)) == -1)
errno = saved_errno; errno = saved_errno;
} }
# endif # endif