diff options
| author | sashan <anedvedicky@gmail.com> | 2022-05-29 10:32:57 +0200 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2022-11-04 12:28:40 -0400 |
| commit | 440c974aee745cd435d5cecc8976d7679ae1f7a6 (patch) | |
| tree | 49efdda7d6313104758a78fda48f2fa4fcc50165 | |
| parent | 782e3cf8e909ff7ad62c3b49e18aaad3e9c65279 (diff) | |
| download | krb5-440c974aee745cd435d5cecc8976d7679ae1f7a6.zip krb5-440c974aee745cd435d5cecc8976d7679ae1f7a6.tar.gz krb5-440c974aee745cd435d5cecc8976d7679ae1f7a6.tar.bz2 | |
Fix uncommon PKINIT memory leak
PKINIT per-request module data objects are normally created by
pkinit_server_verify_padata() and freed by
pkinit_server_return_padata(). In some unusual circumstances, the KDC
may not call the return_padata method after verification succeeds.
Add a free_modreq method and free the object there instead.
[ghudson@mit.edu: rewrote commit message]
(cherry picked from commit 883415036a4b4e0372b84a5a6e46c10b3a67aba0)
ticket: 9065
version_fixed: 1.20.1
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_srv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c index 1147a8f..865c543 100644 --- a/src/plugins/preauth/pkinit/pkinit_srv.c +++ b/src/plugins/preauth/pkinit/pkinit_srv.c @@ -1022,7 +1022,6 @@ pkinit_server_return_padata(krb5_context context, (*send_pa)->contents = (krb5_octet *) out_data->data; cleanup: - pkinit_fini_kdc_req_context(context, reqctx); free(scratch.data); free(out_data); if (encoded_dhkey_info != NULL) @@ -1612,6 +1611,13 @@ pkinit_fini_kdc_req_context(krb5_context context, void *ctx) free(reqctx); } +static void +pkinit_free_modreq(krb5_context context, krb5_kdcpreauth_moddata moddata, + krb5_kdcpreauth_modreq modreq) +{ + pkinit_fini_kdc_req_context(context, modreq); +} + krb5_error_code kdcpreauth_pkinit_initvt(krb5_context context, int maj_ver, int min_ver, krb5_plugin_vtable vtable); @@ -1633,5 +1639,6 @@ kdcpreauth_pkinit_initvt(krb5_context context, int maj_ver, int min_ver, vt->edata = pkinit_server_get_edata; vt->verify = pkinit_server_verify_padata; vt->return_padata = pkinit_server_return_padata; + vt->free_modreq = pkinit_free_modreq; return 0; } |