oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hdb: Fix crash when expected KR is missing

Browse Source
This commit is contained in:
Nicolas Williams
2021-10-30 00:40:32 -05:00
parent 2a9b57cdad
commit 831a5f9db3
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hdb/common.c
View File

@@ -995,6 +995,8 @@ derive_keys(krb5_context context,
/* Installing keys invalidates `ckr', so we copy it */ /* Installing keys invalidates `ckr', so we copy it */
ret = hdb_entry_get_key_rotation(context, &h->entry, &ckr); ret = hdb_entry_get_key_rotation(context, &h->entry, &ckr);
if (!ckr)
return ret;
if (ret == 0) if (ret == 0)
ret = copy_HDB_Ext_KeyRotation(ckr, &kr); ret = copy_HDB_Ext_KeyRotation(ckr, &kr);
} }

3
lib/hdb/hdb.c
View File

@@ -246,6 +246,9 @@ hdb_remove_base_keys(krb5_context context,
size_t i, k; size_t i, k;
ret = hdb_entry_get_key_rotation(context, e, &ckr); ret = hdb_entry_get_key_rotation(context, e, &ckr);
if (!ckr)
return 0;
if (ret == 0) { if (ret == 0) {
/* /*
* Changing the entry's extensions invalidates extensions obtained * Changing the entry's extensions invalidates extensions obtained