mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 00:50:50 +00:00
heimdal: Handle other types of garbage data
In addition to garbage realm data, also handle garbage dbname, acl_file, stash_file, and invalid bitmask garbage data. PR: 267912 Reported by: Robert Morris <rtm@lcs.mit.edu> MFC after: 3 days
This commit is contained in:
parent
05bc50bdb1
commit
91db848212
|
@ -333,12 +333,38 @@ _kadm5_unmarshal_params(krb5_context context,
|
|||
ret = krb5_ret_int32(sp, &mask);
|
||||
if (ret)
|
||||
goto out;
|
||||
if (mask & KADM5_CONFIG_REALM & KADM5_CONFIG_DBNAME
|
||||
& KADM5_CONFIG_ACL_FILE & KADM5_CONFIG_STASH_FILE) {
|
||||
ret = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
params->mask = mask;
|
||||
|
||||
if (params->mask & KADM5_CONFIG_REALM) {
|
||||
ret = krb5_ret_string(sp, ¶ms->realm);
|
||||
if (params->realm == NULL) {
|
||||
ret = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
if (params->mask & KADM5_CONFIG_DBNAME) {
|
||||
ret = krb5_ret_string(sp, ¶ms->dbname);
|
||||
if (params->dbname == NULL) {
|
||||
ret = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
if (params->mask & KADM5_CONFIG_ACL_FILE) {
|
||||
ret = krb5_ret_string(sp, ¶ms->acl_file);
|
||||
if (params->acl_file == NULL) {
|
||||
ret = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
if (params->mask & KADM5_CONFIG_STASH_FILE) {
|
||||
ret = krb5_ret_string(sp, ¶ms->stash_file);
|
||||
if (params->stash_file == NULL) {
|
||||
ret = EINVAL;
|
||||
}
|
||||
}
|
||||
out:
|
||||
|
|
Loading…
Reference in a new issue