From f44596b14b59342592950b43361edf4ac2ea6dfa Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Fri, 10 Dec 2021 16:53:19 -0600 Subject: [PATCH] krb5: Fix null deref in krb5_init_creds_free() --- lib/krb5/init_creds_pw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c index 515bbbd21..a70c5a4f7 100644 --- a/lib/krb5/init_creds_pw.c +++ b/lib/krb5/init_creds_pw.c @@ -213,7 +213,8 @@ free_init_creds_ctx(krb5_context context, krb5_init_creds_context ctx) krb5_free_keyblock(context, ctx->fast_state.strengthen_key); krb5_data_free(&ctx->fast_state.cookie); krb5_free_keyblock_contents(context, &ctx->fast_state.armor_key); - if (ctx->fast_state.flags & KRB5_FAST_ANON_PKINIT_ARMOR) + if ((ctx->fast_state.flags & KRB5_FAST_ANON_PKINIT_ARMOR) && + ctx->fast_state.armor_ccache) krb5_cc_destroy(context, ctx->fast_state.armor_ccache); if (ctx->fast_state.anon_pkinit_ctx) free_init_creds_ctx(context, ctx->fast_state.anon_pkinit_ctx);