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

Plug memory leak when debug file cannot be opened.

Browse Source 
Use %zu printf format now that our snprintf support it.
This commit is contained in:
Todd C. Miller
2015-02-23 15:40:37 -07:00
parent a604f0f02d
commit 23f4e49f4d
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/util/sudo_debug.c
View File

@@ -133,6 +133,19 @@ static int sudo_debug_max_fd = -1;
/* Default instance index to use for common utility functions. */ /* Default instance index to use for common utility functions. */
static int sudo_debug_active_instance = -1; static int sudo_debug_active_instance = -1;
/*
* Free the specified output structure.
*/
static void
sudo_debug_free_output(struct sudo_debug_output *output)
{
sudo_efree(output->filename);
sudo_efree(output->settings);
if (output->fd != -1)
close(output->fd);
sudo_efree(output);
}
/* /*
* Create a new output file for the specified debug instance. * Create a new output file for the specified debug instance.
*/ */
@@ -163,8 +176,10 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
output->fd = open(output->filename, O_WRONLY|O_APPEND|O_CREAT, output->fd = open(output->filename, O_WRONLY|O_APPEND|O_CREAT,
S_IRUSR|S_IWUSR); S_IRUSR|S_IWUSR);
} }
if (output->fd == -1) if (output->fd == -1) {
sudo_debug_free_output(output);
return NULL; return NULL;
}
ignore_result(fchown(output->fd, (uid_t)-1, 0)); ignore_result(fchown(output->fd, (uid_t)-1, 0));
} }
(void)fcntl(output->fd, F_SETFD, FD_CLOEXEC); (void)fcntl(output->fd, F_SETFD, FD_CLOEXEC);
@@ -180,10 +195,7 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
sudo_debug_max_fd = output->fd; sudo_debug_max_fd = output->fd;
/* Parse Debug conf string. */ /* Parse Debug conf string. */
if ((buf = strdup(debug_file->debug_flags)) == NULL) { buf = sudo_estrdup(debug_file->debug_flags);
/* XXX - free output on error or make non-destructive */
return NULL;
}
for ((cp = strtok(buf, ",")); cp != NULL; (cp = strtok(NULL, ","))) { for ((cp = strtok(buf, ",")); cp != NULL; (cp = strtok(NULL, ","))) {
/* Should be in the form subsys@pri. */ /* Should be in the form subsys@pri. */
subsys = cp; subsys = cp;
@@ -429,9 +441,8 @@ void
sudo_debug_exit_size_t_v1(const char *func, const char *file, int line, sudo_debug_exit_size_t_v1(const char *func, const char *file, int line,
int subsys, size_t rval) int subsys, size_t rval)
{ {
/* XXX - should use %zu but our snprintf.c doesn't support it */
sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE,
"<- %s @ %s:%d := %lu", func, file, line, (unsigned long)rval); "<- %s @ %s:%d := %zu", func, file, line, rval);
} }
/* We use int, not bool, here for functions that return -1 on error. */ /* We use int, not bool, here for functions that return -1 on error. */