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

Do not leak struct sudo_command when the command is ALL.

Browse Source 
Coverity CID 185602.
This commit is contained in:
Todd C. Miller
2018-05-14 13:47:00 -06:00
parent 808ec34ab4
commit 93eec5fb9f
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/sudoers/ldap_util.c
View File

@@ -286,9 +286,7 @@ sudo_ldap_role_to_priv(const char *cn, void *hosts, void *runasusers,
{ {
struct cmndspec_list negated_cmnds = TAILQ_HEAD_INITIALIZER(negated_cmnds); struct cmndspec_list negated_cmnds = TAILQ_HEAD_INITIALIZER(negated_cmnds);
struct member_list negated_hosts = TAILQ_HEAD_INITIALIZER(negated_hosts); struct member_list negated_hosts = TAILQ_HEAD_INITIALIZER(negated_hosts);
struct cmndspec *cmndspec = NULL;
struct cmndspec *prev_cmndspec = NULL; struct cmndspec *prev_cmndspec = NULL;
struct sudo_command *c;
struct privilege *priv; struct privilege *priv;
struct member *m; struct member *m;
char *cmnd; char *cmnd;
@@ -328,19 +326,23 @@ sudo_ldap_role_to_priv(const char *cn, void *hosts, void *runasusers,
* Parse sudoCommands and add to cmndlist. * Parse sudoCommands and add to cmndlist.
*/ */
while ((cmnd = iter(&cmnds)) != NULL) { while ((cmnd = iter(&cmnds)) != NULL) {
char *args;
struct sudo_digest digest;
bool negated = sudo_ldap_is_negated(&cmnd); bool negated = sudo_ldap_is_negated(&cmnd);
struct sudo_command *c = NULL;
struct cmndspec *cmndspec;
/* Allocate storage upfront. */ /* Allocate storage upfront. */
cmndspec = calloc(1, sizeof(*cmndspec)); if ((cmndspec = calloc(1, sizeof(*cmndspec))) == NULL)
c = calloc(1, sizeof(*c));
m = calloc(1, sizeof(*m));
if (cmndspec == NULL || c == NULL || m == NULL) {
free(cmndspec);
free(c);
free(m);
goto oom; goto oom;
if ((m = calloc(1, sizeof(*m))) == NULL) {
free(cmndspec);
goto oom;
}
if (strcmp(cmnd, "ALL") != 0) {
if ((c = calloc(1, sizeof(*c))) == NULL) {
free(cmndspec);
free(m);
goto oom;
}
} }
/* Negated commands have precedence so insert them at the end. */ /* Negated commands have precedence so insert them at the end. */
@@ -357,9 +359,13 @@ sudo_ldap_role_to_priv(const char *cn, void *hosts, void *runasusers,
/* Fill in member. */ /* Fill in member. */
m->negated = negated; m->negated = negated;
if (strcmp(cmnd, "ALL") == 0) { if (c == NULL) {
/* No command name for "ALL" */
m->type = ALL; m->type = ALL;
} else { } else {
struct sudo_digest digest;
char *args;
m->type = COMMAND; m->type = COMMAND;
m->name = (char *)c; m->name = (char *)c;