Commit abcf2411 authored by Pavel Kopyl's avatar Pavel Kopyl Committed by Matt Caswell
Browse files

X509V3_EXT_add_nconf_sk, X509v3_add_ext: fix errors handling 



X509v3_add_ext: free 'sk' if the memory pointed to by it
was malloc-ed inside this function.
X509V3_EXT_add_nconf_sk: return an error if X509v3_add_ext() fails.
This prevents use of a freed memory in do_body:sk_X509_EXTENSION_num().

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4698)
parent 8db7946e

crypto/x509/x509_v3.c

+2 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, 
    X509err(X509_F_X509V3_ADD_EXT, ERR_R_MALLOC_FAILURE);

 err2:

    X509_EXTENSION_free(new_ex);

    if (x != NULL && *x == NULL)

        sk_X509_EXTENSION_free(sk);

    return NULL;

}

crypto/x509v3/v3_conf.c

+6 −2
Original line number Diff line number Diff line
@@ -313,8 +313,12 @@ int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section, 
            return 0;

        if (ctx->flags == X509V3_CTX_REPLACE)

            delete_ext(*sk, ext);

        if (sk)

            X509v3_add_ext(sk, ext, -1);

        if (sk != NULL) {

            if (X509v3_add_ext(sk, ext, -1) == NULL) {

                X509_EXTENSION_free(ext);

                return 0;

            }

        }

        X509_EXTENSION_free(ext);

    }

    return 1;