Commit 1400f013 authored by Emilia Kasper's avatar Emilia Kasper
Browse files

Fix memory leaks in ASN.1 



These leaks affect 1.1.0 dev branch only; introduced around commit
f93ad22f

Found with LibFuzzer

Reviewed-by: default avatarBen Laurie <ben@openssl.org>
parent b5851bbc

crypto/asn1/tasn_dec.c

+8 −1
Original line number Diff line number Diff line
@@ -273,6 +273,12 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in, 
            /* If field not present, try the next one */

            if (ret == -1)

                continue;

            /*

             * Set the choice selector here to ensure that the value is

             * correctly freed upon error. It may be partially initialized

             * even if parsing failed.

             */

            asn1_set_choice_selector(pval, i, it);

            /* If positive return, read OK, break loop */

            if (ret > 0)

                break;
@@ -294,7 +300,6 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in, 
            goto err;

        }



        asn1_set_choice_selector(pval, i, it);

        if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it, NULL))

            goto auxerr;

        *in = p;
@@ -617,6 +622,8 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val, 
                                     ASN1_ITEM_ptr(tt->item), -1, 0, 0, ctx)) {

                ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I,

                        ERR_R_NESTED_ASN1_ERROR);

                /* |skfield| may be partially allocated despite failure. */

                ASN1_item_free(skfield, ASN1_ITEM_ptr(tt->item));

                goto err;

            }

            len -= p - q;

test/Makefile.in

+7 −3
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ DTLSV1LISTENTEST = dtlsv1listentest 
CTTEST=	ct_test

THREADSTEST=	threadstest

AFALGTEST= afalgtest

D2ITEST = d2i_test



TESTS=		alltests
@@ -106,7 +107,7 @@ EXE= $(NPTEST)$(EXE_EXT) $(MEMLEAKTEST)$(EXE_EXT) \ 
	$(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \

	$(CLIENTHELLOTEST)$(EXE_EXT) $(PACKETTEST)$(EXE_EXT) $(ASYNCTEST)$(EXE_EXT) \

	$(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT) $(THREADSTEST)$(EXE_EXT) \

	$(AFALGTEST)$(EXE_EXT)

	$(AFALGTEST)$(EXE_EXT) $(D2ITEST)$(EXE_EXT)



# $(METHTEST)$(EXE_EXT)
@@ -124,7 +125,7 @@ OBJ= $(NPTEST).o $(MEMLEAKTEST).o \ 
	$(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \

	$(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \

	$(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o \

	$(THREADSTEST).o testutil.o $(AFALGTEST).o

	$(THREADSTEST).o testutil.o $(AFALGTEST).o $(D2ITEST).o



SRC=	$(NPTEST).c $(MEMLEAKTEST).c \

	$(BNTEST).c $(ECTEST).c \
@@ -139,7 +140,7 @@ SRC= $(NPTEST).c $(MEMLEAKTEST).c \ 
	$(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \

	$(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \

	$(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c \

	$(THREADSTEST).c testutil.c $(AFALGTEST).c

	$(THREADSTEST).c testutil.c $(AFALGTEST).c $(D2ITEST).c



HEADER=	testutil.h
@@ -385,4 +386,7 @@ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) 
$(AFALGTEST)$(EXE_EXT): $(AFALGTEST).o $(DLIBCRYPTO)

	@target=$(AFALGTEST); $(BUILD_CMD)



$(D2ITEST)$(EXE_EXT): $(D2ITEST).o $(DLIBCRYPTO) testutil.o

	@target=$(D2ITEST) testutil=testutil.o; $(BUILD_CMD)



# DO NOT DELETE THIS LINE -- make depend depends on it.

test/build.info

+5 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ PROGRAMS=\ 
        danetest heartbeat_test p5_crpt2_test \

        constant_time_test verify_extra_test clienthellotest \

        packettest asynctest secmemtest srptest memleaktest \

        dtlsv1listentest ct_test threadstest afalgtest

        dtlsv1listentest ct_test threadstest afalgtest d2i_test



SOURCE[aborttest]=aborttest.c

INCLUDE[aborttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
@@ -220,4 +220,8 @@ SOURCE[afalgtest]=afalgtest.c 
INCLUDE[afalgtest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include

DEPEND[afalgtest]=../libcrypto



SOURCE[d2i_test]=d2i_test.c testutil.c

INCLUDE[d2i_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include

DEPEND[d2i_test]=../libcrypto



INCLUDE[testutil.o]=..

test/d2i-tests/bad_cert.der

0 → 100644
+1007 B

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

test/d2i-tests/bad_generalname.der

0 → 100644
+0 −0

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file