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

sudo_ldap_parse_option() never returns '=' as the operator.

Browse Source 
When parsing command_timeout, role, type, privs and limitprivs,
check that val is non-NULL instead.  Found by PVS Studio.
This commit is contained in:
Todd C. Miller
2018-10-16 12:49:34 -06:00
parent a9fd783f20
commit e1a402f1d6
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/sudoers/ldap_util.c
View File

@@ -405,32 +405,23 @@ sudo_ldap_role_to_priv(const char *cn, void *hosts, void *runasusers,
int op; int op;
op = sudo_ldap_parse_option(opt, &var, &val); op = sudo_ldap_parse_option(opt, &var, &val);
if (strcmp(var, "command_timeout") == 0) { if (strcmp(var, "command_timeout") == 0 && val != NULL) {
if (op == '=') cmndspec->timeout = parse_timeout(val);
cmndspec->timeout = parse_timeout(val);
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX
} else if (strcmp(var, "role") == 0) { } else if (strcmp(var, "role") == 0 && val != NULL) {
if (op == '=') { if ((cmndspec->role = strdup(val)) == NULL)
if ((cmndspec->role = strdup(val)) == NULL) goto oom;
goto oom; } else if (strcmp(var, "type") == 0 && val != NULL) {
} if ((cmndspec->type = strdup(val)) == NULL)
} else if (strcmp(var, "type") == 0) { goto oom;
if (op == '=') {
if ((cmndspec->type = strdup(val)) == NULL)
goto oom;
}
#endif /* HAVE_SELINUX */ #endif /* HAVE_SELINUX */
#ifdef HAVE_PRIV_SET #ifdef HAVE_PRIV_SET
} else if (strcmp(var, "privs") == 0) { } else if (strcmp(var, "privs") == 0 && val != NULL) {
if (op == '=') { if ((cmndspec->privs = strdup(val)) == NULL)
if ((cmndspec->privs = strdup(val)) == NULL) goto oom;
goto oom; } else if (strcmp(var, "limitprivs") == 0 && val != NULL) {
} if ((cmndspec->limitprivs = strdup(val)) == NULL)
} else if (strcmp(var, "limitprivs") == 0) { goto oom;
if (op == '=') {
if ((cmndspec->limitprivs = strdup(val)) == NULL)
goto oom;
}
#endif /* HAVE_PRIV_SET */ #endif /* HAVE_PRIV_SET */
} else if (store_options) { } else if (store_options) {
if (!sudo_ldap_add_default(var, val, op, source, if (!sudo_ldap_add_default(var, val, op, source,