mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

Implement sudoers_policy_deregister_hooks()

Browse Source 
Register/deregister hooks in fuzz_policy and also call show_version().
This commit is contained in:
Todd C. Miller
2021-02-25 15:02:09 -07:00
parent e6dc13229f
commit b3b80fe6df
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/defaults.c
View File

@@ -81,7 +81,6 @@ static bool valid_path(struct sudo_defs_types *def, const char *val, const char
void void
dump_defaults(void) dump_defaults(void)
{ {
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
struct sudo_defs_types *cur; struct sudo_defs_types *cur;
struct list_member *item; struct list_member *item;
struct def_values *def; struct def_values *def;
@@ -165,7 +164,6 @@ dump_defaults(void)
} }
} }
debug_return; debug_return;
#endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */
} }
/* /*

19
plugins/sudoers/policy.c
View File

@@ -1193,6 +1193,24 @@ sudoers_policy_register_hooks(int version, int (*register_hook)(struct sudo_hook
} }
} }
/*
* De-register environment function hooks.
*/
static void
sudoers_policy_deregister_hooks(int version, int (*deregister_hook)(struct sudo_hook *hook))
{
struct sudo_hook *hook;
for (hook = sudoers_hooks; hook->hook_fn != NULL; hook++) {
if (deregister_hook(hook) != 0) {
sudo_warn_nodebug(
U_("unable to deregister hook of type %d (version %d.%d)"),
hook->hook_type, SUDO_API_VERSION_GET_MAJOR(hook->hook_version),
SUDO_API_VERSION_GET_MINOR(hook->hook_version));
}
}
}
sudo_dso_public struct policy_plugin sudoers_policy = { sudo_dso_public struct policy_plugin sudoers_policy = {
SUDO_POLICY_PLUGIN, SUDO_POLICY_PLUGIN,
SUDO_API_VERSION, SUDO_API_VERSION,
@@ -1205,5 +1223,6 @@ sudo_dso_public struct policy_plugin sudoers_policy = {
sudoers_policy_invalidate, sudoers_policy_invalidate,
sudoers_policy_init_session, sudoers_policy_init_session,
sudoers_policy_register_hooks, sudoers_policy_register_hooks,
sudoers_policy_deregister_hooks,
NULL /* event_alloc() filled in by sudo */ NULL /* event_alloc() filled in by sudo */
}; };

12
plugins/sudoers/regress/fuzz/fuzz_policy.c
View File

@@ -134,6 +134,12 @@ fuzz_printf(int msg_type, const char *fmt, ...)
return 0; return 0;
} }
int
fuzz_hook_stub(struct sudo_hook *hook)
{
return 0;
}
int int
LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{ {
@@ -270,6 +276,8 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
free(line); free(line);
line = NULL; line = NULL;
sudoers_policy.register_hooks(SUDO_API_VERSION, fuzz_hook_stub);
for (i = 0; i < num_checks; i++) { for (i = 0; i < num_checks; i++) {
/* Call policy open function */ /* Call policy open function */
res = sudoers_policy.open(SUDO_API_VERSION, fuzz_conversation, fuzz_printf, res = sudoers_policy.open(SUDO_API_VERSION, fuzz_conversation, fuzz_printf,
@@ -279,6 +287,9 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
switch (res) { switch (res) {
case 1: case 1:
/* success */ /* success */
if (i == 0)
sudoers_policy.show_version(true);
if (argv.len == 0) { if (argv.len == 0) {
/* Must have a command to check. */ /* Must have a command to check. */
push(&argv, "/usr/bin/id"); push(&argv, "/usr/bin/id");
@@ -318,6 +329,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
env_init(NULL); env_init(NULL);
} }
sudoers_policy.deregister_hooks(SUDO_API_VERSION, fuzz_hook_stub);
sudoers_gc_run(); sudoers_gc_run();
free_dynamic_array(&plugin_args); free_dynamic_array(&plugin_args);