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

Make sudoers_user_ctx_free() private to sudoers.c

Browse Source
This commit is contained in:
Todd C. Miller
2023-08-12 10:39:48 -06:00
parent bd8cccb5dd
commit 30c49288f7
2 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
plugins/sudoers/sudoers.c
View File

@@ -1488,6 +1488,62 @@ cb_runas_default(const char *file, int line, int column,
debug_return_bool(true); debug_return_bool(true);
} }
/*
* Free memory allocated for struct sudoers_user_context.
*/
static void
sudoers_user_ctx_free(void)
{
debug_decl(sudoers_user_ctx_free, SUDOERS_DEBUG_PLUGIN);
/* Free remaining references to password and group entries. */
if (user_ctx.pw != NULL)
sudo_pw_delref(user_ctx.pw);
if (runas_pw != NULL)
sudo_pw_delref(runas_pw);
if (runas_gr != NULL)
sudo_gr_delref(runas_gr);
if (user_gid_list != NULL)
sudo_gidlist_delref(user_gid_list);
/* Free dynamic contents of user_ctx. */
free(user_cwd);
free(user_name);
free(user_gids);
if (user_ttypath != NULL)
free(user_ttypath);
else
free(user_tty);
if (user_shost != user_host)
free(user_shost);
free(user_host);
if (user_srunhost != user_runhost)
free(user_srunhost);
free(user_runhost);
free(user_cmnd);
canon_path_free(user_cmnd_dir);
free(user_args);
free(list_cmnd);
free(safe_cmnd);
free(saved_cmnd);
free(user_ctx.source);
free(user_stat);
#ifdef HAVE_SELINUX
free(user_role);
free(user_type);
#endif
#ifdef HAVE_APPARMOR
free(user_apparmor_profile);
#endif
#ifdef HAVE_PRIV_SET
free(runas_privs);
free(runas_limitprivs);
#endif
memset(&user_ctx, 0, sizeof(user_ctx));
debug_return;
}
/* /*
* Cleanup hook for sudo_fatal()/sudo_fatalx() * Cleanup hook for sudo_fatal()/sudo_fatalx()
* Also called at policy close time. * Also called at policy close time.
@@ -1550,59 +1606,3 @@ tty_present(void)
} }
debug_return_bool(true); debug_return_bool(true);
} }
/*
* Free memory allocated for struct sudoers_user_context.
*/
void
sudoers_user_ctx_free(void)
{
debug_decl(sudoers_user_ctx_free, SUDOERS_DEBUG_PLUGIN);
/* Free remaining references to password and group entries. */
if (user_ctx.pw != NULL)
sudo_pw_delref(user_ctx.pw);
if (runas_pw != NULL)
sudo_pw_delref(runas_pw);
if (runas_gr != NULL)
sudo_gr_delref(runas_gr);
if (user_gid_list != NULL)
sudo_gidlist_delref(user_gid_list);
/* Free dynamic contents of user_ctx. */
free(user_cwd);
free(user_name);
free(user_gids);
if (user_ttypath != NULL)
free(user_ttypath);
else
free(user_tty);
if (user_shost != user_host)
free(user_shost);
free(user_host);
if (user_srunhost != user_runhost)
free(user_srunhost);
free(user_runhost);
free(user_cmnd);
canon_path_free(user_cmnd_dir);
free(user_args);
free(list_cmnd);
free(safe_cmnd);
free(saved_cmnd);
free(user_ctx.source);
free(user_stat);
#ifdef HAVE_SELINUX
free(user_role);
free(user_type);
#endif
#ifdef HAVE_APPARMOR
free(user_apparmor_profile);
#endif
#ifdef HAVE_PRIV_SET
free(runas_privs);
free(runas_limitprivs);
#endif
memset(&user_ctx, 0, sizeof(user_ctx));
debug_return;
}

1
plugins/sudoers/sudoers.h
View File

@@ -421,7 +421,6 @@ int sudoers_list(int argc, char *const argv[], const char *list_user, bool verbo
int sudoers_validate_user(void); int sudoers_validate_user(void);
void sudoers_cleanup(void); void sudoers_cleanup(void);
bool sudoers_override_umask(void); bool sudoers_override_umask(void);
void sudoers_user_ctx_free(void);
extern struct sudoers_user_context user_ctx; extern struct sudoers_user_context user_ctx;
extern struct passwd *list_pw; extern struct passwd *list_pw;
extern unsigned int sudo_mode; extern unsigned int sudo_mode;