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

Better error message when debug log file cannot be opened.

Browse Source
This commit is contained in:
Todd C. Miller
2019-09-21 07:47:24 -06:00
parent 81a30dd44d
commit 73dd3849c6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/util/sudo_debug.c
View File

@@ -155,15 +155,15 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
/* XXX - reuse fd for existing filename? */ /* XXX - reuse fd for existing filename? */
output = calloc(1, sizeof(*output)); output = calloc(1, sizeof(*output));
if (output == NULL) if (output == NULL)
goto bad; goto oom;
output->fd = -1; output->fd = -1;
output->settings = reallocarray(NULL, instance->max_subsystem + 1, output->settings = reallocarray(NULL, instance->max_subsystem + 1,
sizeof(int)); sizeof(int));
if (output->settings == NULL) if (output->settings == NULL)
goto bad; goto oom;
output->filename = strdup(debug_file->debug_file); output->filename = strdup(debug_file->debug_file);
if (output->filename == NULL) if (output->filename == NULL)
goto bad; goto oom;
output->fd = -1; output->fd = -1;
/* Init per-subsystems settings to -1 since 0 is a valid priority. */ /* Init per-subsystems settings to -1 since 0 is a valid priority. */
@@ -178,8 +178,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_warn_nodebug("%s", output->filename);
goto bad; goto bad;
}
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);
@@ -191,7 +193,7 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
new_fds = realloc(sudo_debug_fds, new_size); new_fds = realloc(sudo_debug_fds, new_size);
if (new_fds == NULL) if (new_fds == NULL)
goto bad; goto oom;
memset(new_fds + old_size, 0, new_size - old_size); memset(new_fds + old_size, 0, new_size - old_size);
sudo_debug_fds = new_fds; sudo_debug_fds = new_fds;
sudo_debug_fds_size = new_size * NBBY; sudo_debug_fds_size = new_size * NBBY;
@@ -203,7 +205,7 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
/* Parse Debug conf string. */ /* Parse Debug conf string. */
buf = strdup(debug_file->debug_flags); buf = strdup(debug_file->debug_flags);
if (buf == NULL) if (buf == NULL)
goto bad; goto oom;
for ((cp = strtok_r(buf, ",", &last)); cp != NULL; (cp = strtok_r(NULL, ",", &last))) { for ((cp = strtok_r(buf, ",", &last)); cp != NULL; (cp = strtok_r(NULL, ",", &last))) {
/* Should be in the form subsys@pri. */ /* Should be in the form subsys@pri. */
subsys = cp; subsys = cp;
@@ -237,8 +239,9 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
free(buf); free(buf);
return output; return output;
bad: oom:
sudo_warn_nodebug(NULL); sudo_warn_nodebug(NULL);
bad:
if (output != NULL) if (output != NULL)
sudo_debug_free_output(output); sudo_debug_free_output(output);
return NULL; return NULL;