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

Instead of using stat(2) to see if the admin flag file exists and

Browse Source 
creating it if not, just try to create the file and treat EEXIST
as a non-error.  Coverity CID 104121.
This commit is contained in:
Todd C. Miller
2016-05-06 14:12:08 -06:00
parent bb12328064
commit 151e03fb5b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/sudoers/sudoers.c
View File

@@ -1262,9 +1262,8 @@ find_editor(int nfiles, char **files, int *argc_out, char ***argv_out)
static int static int
create_admin_success_flag(void) create_admin_success_flag(void)
{ {
struct stat statbuf;
char flagfile[PATH_MAX]; char flagfile[PATH_MAX];
int len, fd = -1; int len, rval = -1;
debug_decl(create_admin_success_flag, SUDOERS_DEBUG_PLUGIN) debug_decl(create_admin_success_flag, SUDOERS_DEBUG_PLUGIN)
/* Check whether the user is in the admin group. */ /* Check whether the user is in the admin group. */
@@ -1279,15 +1278,14 @@ create_admin_success_flag(void)
/* Create admin flag file if it doesn't already exist. */ /* Create admin flag file if it doesn't already exist. */
if (set_perms(PERM_USER)) { if (set_perms(PERM_USER)) {
if (stat(flagfile, &statbuf) != 0) { int fd = open(flagfile, O_CREAT|O_WRONLY|O_NONBLOCK|O_EXCL, 0644);
fd = open(flagfile, O_CREAT|O_WRONLY|O_EXCL, 0644); rval = fd != -1 || errno == EEXIST;
if (fd != -1) if (fd != -1)
close(fd); close(fd);
}
if (!restore_perms()) if (!restore_perms())
debug_return_int(-1); rval = -1;
} }
debug_return_int(fd != -1); debug_return_int(rval);
} }
#else /* !USE_ADMIN_FLAG */ #else /* !USE_ADMIN_FLAG */
static int static int