mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00
Code Issues Releases Wiki Activity

In sudo_krb5_copy_cc_file() move the close(ofd) to the done: label

Browse Source 
so we only have to cleanup in one place.  Coverity CID 104577.
This commit is contained in:
Todd C. Miller
2016-05-07 08:18:27 -06:00
parent 0568fa90cf
commit 194c7c8069
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/sudoers/ldap.c
View File

@@ -2587,7 +2587,7 @@ sudo_set_krb5_ccache_name(const char *name, const char **old_name)
static char * static char *
sudo_krb5_copy_cc_file(const char *old_ccname) sudo_krb5_copy_cc_file(const char *old_ccname)
{ {
int ofd, nfd; int nfd, ofd = -1;
ssize_t nread, nwritten = -1; ssize_t nread, nwritten = -1;
static char new_ccname[sizeof(_PATH_TMP) + sizeof("sudocc_XXXXXXXX") - 1]; static char new_ccname[sizeof(_PATH_TMP) + sizeof("sudocc_XXXXXXXX") - 1];
char buf[10240], *ret = NULL; char buf[10240], *ret = NULL;
@@ -2599,10 +2599,8 @@ sudo_krb5_copy_cc_file(const char *old_ccname)
if (!set_perms(PERM_USER)) if (!set_perms(PERM_USER))
goto done; goto done;
ofd = open(old_ccname, O_RDONLY|O_NONBLOCK); ofd = open(old_ccname, O_RDONLY|O_NONBLOCK);
if (!restore_perms()) { if (!restore_perms())
close(ofd);
goto done; goto done;
}
if (ofd != -1) { if (ofd != -1) {
(void) fcntl(ofd, F_SETFL, 0); (void) fcntl(ofd, F_SETFL, 0);
@@ -2637,13 +2635,14 @@ write_error:
sudo_warn("unable to create temp file %s", new_ccname); sudo_warn("unable to create temp file %s", new_ccname);
} }
} }
close(ofd);
} else { } else {
sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO, sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO,
"unable to open %s", old_ccname); "unable to open %s", old_ccname);
} }
} }
done: done:
if (ofd != -1)
close(ofd);
debug_return_str(ret); debug_return_str(ret);
} }