diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2012-05-21 20:36:44 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-05-22 09:12:20 -0400 |
commit | 6da9b3bcbee97fbfdb02c652ddcd0ab048224997 (patch) | |
tree | 1aab5110a6f6bd7b5c4798c819ea3093dbb4aac4 | |
parent | fbd3a264e5ab80f8aa8918732cd5360389b42a90 (diff) | |
download | sssd-6da9b3bcbee97fbfdb02c652ddcd0ab048224997.tar.gz sssd-6da9b3bcbee97fbfdb02c652ddcd0ab048224997.tar.xz sssd-6da9b3bcbee97fbfdb02c652ddcd0ab048224997.zip |
KRB5: Avoid NULL-dereference with empty keytab
https://fedorahosted.org/sssd/ticket/1330
-rw-r--r-- | src/util/sss_krb5.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c index a59afb26e..c944bf02c 100644 --- a/src/util/sss_krb5.c +++ b/src/util/sss_krb5.c @@ -1104,14 +1104,20 @@ sss_krb5_read_etypes_for_keytab(TALLOC_CTX *mem_ctx, } if (ret == 0) { - /* Sort the preferred enctypes first */ - qsort(etypes, count, sizeof(*etypes), compare_etypes); - etypes = talloc_realloc(tmp_ctx, etypes, krb5_enctype, count); - if (etypes == NULL) { - ret = ENOMEM; + if (etypes) { + /* Sort the preferred enctypes first */ + qsort(etypes, count, sizeof(*etypes), compare_etypes); + etypes = talloc_realloc(tmp_ctx, etypes, krb5_enctype, count); + if (etypes == NULL) { + ret = ENOMEM; + } else { + *etype_list = talloc_steal(mem_ctx, etypes); + *n_etype_list = count; + } } else { - *etype_list = talloc_steal(mem_ctx, etypes); - *n_etype_list = count; + /* The key table was empty. There are no enctypes to match */ + *etype_list = NULL; + *n_etype_list = 0; } } |