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

Add free_default() to free a struct defaults pointer so we have a

Browse Source 
single place where we free the defaults.  A pointer to the previous
Default's binding may be passed in to avoid freeing an already free
binding.
This commit is contained in:
Todd C. Miller
2018-03-21 12:11:19 -06:00
parent b6c53ac846
commit bc5e2d06a7
4 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
plugins/sudoers/gram.c
View File

@@ -837,6 +837,8 @@ add_userspec(struct member *members, struct privilege *privs)
void
free_member(struct member *m)
{
debug_decl(free_member, SUDOERS_DEBUG_PARSER)
if (m->type == COMMAND) {
struct sudo_command *c = (struct sudo_command *)m->name;
free(c->cmnd);
@@ -848,6 +850,8 @@ free_member(struct member *m)
}
free(m->name);
free(m);
debug_return;
}
/*
@@ -857,17 +861,39 @@ void
free_members(struct member_list *members)
{
struct member *m;
debug_decl(free_members, SUDOERS_DEBUG_PARSER)
while ((m = TAILQ_FIRST(members)) != NULL) {
TAILQ_REMOVE(members, m, entries);
free_member(m);
}
debug_return;
}
struct member_list *
free_default(struct defaults *def, struct member_list *binding)
{
debug_decl(free_default, SUDOERS_DEBUG_PARSER)
if (def->binding != binding) {
binding = def->binding;
free_members(def->binding);
free(def->binding);
}
rcstr_delref(def->file);
free(def->var);
free(def->val);
free(def);
debug_return_ptr(binding);
}
void
free_privilege(struct privilege *priv)
{
struct member_list *runasuserlist = NULL, *runasgrouplist = NULL;
struct member_list *binding = NULL;
struct cmndspec *cs;
struct defaults *def;
#ifdef HAVE_SELINUX
@@ -876,6 +902,7 @@ free_privilege(struct privilege *priv)
#ifdef HAVE_PRIV_SET
char *privs = NULL, *limitprivs = NULL;
#endif /* HAVE_PRIV_SET */
debug_decl(free_privilege, SUDOERS_DEBUG_PARSER)
free(priv->ldap_role);
free_members(&priv->hostlist);
@@ -919,11 +946,11 @@ free_privilege(struct privilege *priv)
}
while ((def = TAILQ_FIRST(&priv->defaults)) != NULL) {
TAILQ_REMOVE(&priv->defaults, def, entries);
free(def->var);
free(def->val);
free(def);
binding = free_default(def, binding);
}
free(priv);
debug_return;
}
void
@@ -931,6 +958,7 @@ free_userspec(struct userspec *us)
{
struct privilege *priv;
struct sudoers_comment *comment;
debug_decl(free_userspec, SUDOERS_DEBUG_PARSER)
free_members(&us->users);
while ((priv = TAILQ_FIRST(&us->privileges)) != NULL) {
@@ -944,6 +972,8 @@ free_userspec(struct userspec *us)
}
rcstr_delref(us->file);
free(us);
debug_return;
}
/*
@@ -953,8 +983,8 @@ free_userspec(struct userspec *us)
bool
init_parser(const char *path, bool quiet)
{
struct member_list *binding;
struct defaults *d;
struct member_list *binding = NULL;
struct defaults *def;
struct userspec *us;
bool ret = true;
void *next;
@@ -965,17 +995,8 @@ init_parser(const char *path, bool quiet)
}
TAILQ_INIT(&userspecs);
binding = NULL;
TAILQ_FOREACH_SAFE(d, &defaults, entries, next) {
if (d->binding != binding) {
binding = d->binding;
free_members(d->binding);
free(d->binding);
}
rcstr_delref(d->file);
free(d->var);
free(d->val);
free(d);
TAILQ_FOREACH_SAFE(def, &defaults, entries, next) {
binding = free_default(def, binding);
}
TAILQ_INIT(&defaults);
@@ -1023,7 +1044,7 @@ init_options(struct command_options *opts)
opts->limitprivs = NULL;
#endif
}
#line 974 "gram.c"
#line 995 "gram.c"
/* allocate initial stack or double stack size, up to YYMAXDEPTH */
#if defined(__cplusplus) || defined(__STDC__)
static int yygrowstack(void)
@@ -2148,7 +2169,7 @@ case 116:
}
}
break;
#line 2099 "gram.c"
#line 2120 "gram.c"
}
yyssp -= yym;
yystate = *yyssp;