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

krb5: Check function return values

Browse Source 
Found by Coverity (Samba CID 240644).

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
Joseph Sutton
2023-10-06 10:01:10 +13:00
committed by Nico Williams
parent e53d594d05
commit 0334d9e55a
1 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/krb5/context.c
View File

@@ -284,29 +284,47 @@ init_context_from_config_file(krb5_context context)
static krb5_error_code static krb5_error_code
cc_ops_register(krb5_context context) cc_ops_register(krb5_context context)
{ {
krb5_error_code ret;
context->cc_ops = NULL; context->cc_ops = NULL;
context->num_cc_ops = 0; context->num_cc_ops = 0;
#ifndef KCM_IS_API_CACHE #ifndef KCM_IS_API_CACHE
krb5_cc_register(context, &krb5_acc_ops, TRUE); ret = krb5_cc_register(context, &krb5_acc_ops, TRUE);
if (ret)
return ret;
#endif #endif
krb5_cc_register(context, &krb5_fcc_ops, TRUE); ret = krb5_cc_register(context, &krb5_fcc_ops, TRUE);
krb5_cc_register(context, &krb5_dcc_ops, TRUE); if (ret)
krb5_cc_register(context, &krb5_mcc_ops, TRUE); return ret;
ret = krb5_cc_register(context, &krb5_dcc_ops, TRUE);
if (ret)
return ret;
ret = krb5_cc_register(context, &krb5_mcc_ops, TRUE);
if (ret)
return ret;
#ifdef HAVE_SCC #ifdef HAVE_SCC
krb5_cc_register(context, &krb5_scc_ops, TRUE); ret = krb5_cc_register(context, &krb5_scc_ops, TRUE);
if (ret)
return ret;
#endif #endif
#ifdef HAVE_KCM #ifdef HAVE_KCM
#ifdef KCM_IS_API_CACHE #ifdef KCM_IS_API_CACHE
krb5_cc_register(context, &krb5_akcm_ops, TRUE); ret = krb5_cc_register(context, &krb5_akcm_ops, TRUE);
if (ret)
return ret;
#endif #endif
krb5_cc_register(context, &krb5_kcm_ops, TRUE); ret = krb5_cc_register(context, &krb5_kcm_ops, TRUE);
if (ret)
return ret;
#endif #endif
#if defined(HAVE_KEYUTILS_H) #if defined(HAVE_KEYUTILS_H)
krb5_cc_register(context, &krb5_krcc_ops, TRUE); ret = krb5_cc_register(context, &krb5_krcc_ops, TRUE);
if (ret)
return ret;
#endif #endif
_krb5_load_ccache_plugins(context); ret = _krb5_load_ccache_plugins(context);
return 0; return ret;
} }
static krb5_error_code static krb5_error_code
@@ -338,18 +356,30 @@ cc_ops_copy(krb5_context context, const krb5_context src_context)
static krb5_error_code static krb5_error_code
kt_ops_register(krb5_context context) kt_ops_register(krb5_context context)
{ {
krb5_error_code ret;
context->num_kt_types = 0; context->num_kt_types = 0;
context->kt_types = NULL; context->kt_types = NULL;
krb5_kt_register (context, &krb5_fkt_ops); ret = krb5_kt_register (context, &krb5_fkt_ops);
krb5_kt_register (context, &krb5_wrfkt_ops); if (ret)
krb5_kt_register (context, &krb5_javakt_ops); return ret;
krb5_kt_register (context, &krb5_mkt_ops); ret = krb5_kt_register (context, &krb5_wrfkt_ops);
if (ret)
return ret;
ret = krb5_kt_register (context, &krb5_javakt_ops);
if (ret)
return ret;
ret = krb5_kt_register (context, &krb5_mkt_ops);
if (ret)
return ret;
#ifndef HEIMDAL_SMALLER #ifndef HEIMDAL_SMALLER
krb5_kt_register (context, &krb5_akf_ops); ret = krb5_kt_register (context, &krb5_akf_ops);
if (ret)
return ret;
#endif #endif
krb5_kt_register (context, &krb5_any_ops); ret = krb5_kt_register (context, &krb5_any_ops);
return 0; return ret;
} }
static krb5_error_code static krb5_error_code
@@ -476,8 +506,12 @@ krb5_init_context(krb5_context *context)
/* init error tables */ /* init error tables */
_krb5_init_ets(p); _krb5_init_ets(p);
cc_ops_register(p); ret = cc_ops_register(p);
kt_ops_register(p); if (ret)
goto out;
ret = kt_ops_register(p);
if (ret)
goto out;
#ifdef PKINIT #ifdef PKINIT
ret = hx509_context_init(&p->hx509ctx); ret = hx509_context_init(&p->hx509ctx);