commit dfa3dbb2f5c6d7d32d97c179f6c34e0dbb554111
Author: Xi Wang <xi.wang@gmail.com>
Date:   Thu Feb 14 18:17:40 2013 -0500

    PKINIT null pointer deref [CVE-2013-1415]
    
    Don't dereference a null pointer when cleaning up.
    
    The KDC plugin for PKINIT can dereference a null pointer when a
    malformed packet causes processing to terminate early, leading to
    a crash of the KDC process.  An attacker would need to have a valid
    PKINIT certificate or have observed a successful PKINIT authentication,
    or an unauthenticated attacker could execute the attack if anonymous
    PKINIT is enabled.
    
    CVSSv2 vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:P/RL:O/RC:C
    
    This is a minimal commit for pullup; style fixes in a followup.
    [kaduk@mit.edu: reformat and edit commit message]
    
    (cherry picked from commit c773d3c775e9b2d88bcdff5f8a8ba88d7ec4e8ed)
    
    ticket: 7577 (new)
    version_fixed: 1.10.4
    status: resolved

diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
index 41847a1..7021ff6 100644
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -3249,7 +3249,7 @@ pkinit_check_kdc_pkid(krb5_context context,
     pkiDebug("found kdcPkId in AS REQ\n");
     is = d2i_PKCS7_ISSUER_AND_SERIAL(NULL, &p, (int)pkid_len);
     if (is == NULL)
-        goto cleanup;
+        return retval;
 
     status = X509_NAME_cmp(X509_get_issuer_name(kdc_cert), is->issuer);
     if (!status) {
@@ -3259,7 +3259,6 @@ pkinit_check_kdc_pkid(krb5_context context,
     }
 
     retval = 0;
-cleanup:
     X509_NAME_free(is->issuer);
     ASN1_INTEGER_free(is->serial);
     free(is);