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

Fix reference counting when both sudoers policy and I/O log are loaded.

Browse Source 
If both sudoers policy and I/O log plugins are loaded, debug_files
will be empty when the I/O plugin is initialized.  This changes the
logic to always increase the reference count if the instance is valid.
This commit is contained in:
Todd C. Miller
2020-01-14 17:50:40 -07:00
parent 9c5c79194d
commit e7eef9c3a5
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/sudoers/sudoers_debug.c
View File

@@ -125,21 +125,14 @@ bool
sudoers_debug_register(const char *program, sudoers_debug_register(const char *program,
struct sudo_conf_debug_file_list *debug_files) struct sudo_conf_debug_file_list *debug_files)
{ {
int instance = sudoers_debug_instance;
struct sudo_debug_file *debug_file, *debug_next; struct sudo_debug_file *debug_file, *debug_next;
/* Already initialized? */
if (sudoers_debug_instance != SUDO_DEBUG_INSTANCE_INITIALIZER)
sudo_debug_set_active_instance(sudoers_debug_instance);
/* Setup debugging if indicated. */ /* Setup debugging if indicated. */
if (debug_files != NULL && !TAILQ_EMPTY(debug_files)) { if (debug_files != NULL && !TAILQ_EMPTY(debug_files)) {
if (program != NULL) { if (program != NULL) {
sudoers_debug_instance = sudo_debug_register(program, instance = sudo_debug_register(program, sudoers_subsystem_names,
sudoers_subsystem_names, sudoers_subsystem_ids, debug_files); sudoers_subsystem_ids, debug_files);
if (sudoers_debug_instance == SUDO_DEBUG_INSTANCE_ERROR)
return false;
sudoers_debug_refcnt++;
} }
TAILQ_FOREACH_SAFE(debug_file, debug_files, entries, debug_next) { TAILQ_FOREACH_SAFE(debug_file, debug_files, entries, debug_next) {
TAILQ_REMOVE(debug_files, debug_file, entries); TAILQ_REMOVE(debug_files, debug_file, entries);
@@ -148,6 +141,21 @@ sudoers_debug_register(const char *program,
free(debug_file); free(debug_file);
} }
} }
switch (instance) {
case SUDO_DEBUG_INSTANCE_ERROR:
return false;
case SUDO_DEBUG_INSTANCE_INITIALIZER:
/* Nothing to do */
break;
default:
/* New debug instance or additional reference on existing one. */
sudoers_debug_instance = instance;
sudo_debug_set_active_instance(sudoers_debug_instance);
sudoers_debug_refcnt++;
break;
}
return true; return true;
} }