Commit 680b9d45 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

asn1/tasn_utl.c: fix logical error in and overhaul asn1_do_lock. 



CRYPTO_atomic_add was assumed to return negative value on error, while
it returns 0.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f52292be

crypto/asn1/tasn_utl.c

+23 −12
Original line number Original line Diff line number Diff line
@@ -58,8 +58,10 @@ int asn1_set_choice_selector(ASN1_VALUE **pval, int value, 
int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it)

int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it)

{

{

    const ASN1_AUX *aux;

    const ASN1_AUX *aux;

    int *lck, ret;

    CRYPTO_REF_COUNT *lck;

    CRYPTO_RWLOCK **lock;

    CRYPTO_RWLOCK **lock;

    int ret = -1;



    if ((it->itype != ASN1_ITYPE_SEQUENCE)

    if ((it->itype != ASN1_ITYPE_SEQUENCE)

        && (it->itype != ASN1_ITYPE_NDEF_SEQUENCE))

        && (it->itype != ASN1_ITYPE_NDEF_SEQUENCE))

        return 0;

        return 0;
@@ -68,25 +70,34 @@ int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it) 
        return 0;

        return 0;

    lck = offset2ptr(*pval, aux->ref_offset);

    lck = offset2ptr(*pval, aux->ref_offset);

    lock = offset2ptr(*pval, aux->ref_lock);

    lock = offset2ptr(*pval, aux->ref_lock);

    if (op == 0) {



        *lck = 1;

    switch (op) {

    case 0:

        *lck = ret = 1;

        *lock = CRYPTO_THREAD_lock_new();

        *lock = CRYPTO_THREAD_lock_new();

        if (*lock == NULL) {

        if (*lock == NULL) {

            ASN1err(ASN1_F_ASN1_DO_LOCK, ERR_R_MALLOC_FAILURE);

            ASN1err(ASN1_F_ASN1_DO_LOCK, ERR_R_MALLOC_FAILURE);

            return -1;

            return -1;

        }

        }

        return 1;

        break;

    }

    case 1:

    if (CRYPTO_atomic_add(lck, op, &ret, *lock) < 0)

        if (!CRYPTO_UP_REF(lck, &ret, *lock))

            return -1;

        break;

    case -1:

        if (!CRYPTO_DOWN_REF(lck, &ret, *lock))

            return -1;  /* failed */

            return -1;  /* failed */

#ifdef REF_PRINT

#ifdef REF_PRINT

    fprintf(stderr, "%p:%4d:%s\n", it, *lck, it->sname);

        fprintf(stderr, "%p:%4d:%s\n", it, ret, it->sname);

#endif

#endif

        REF_ASSERT_ISNT(ret < 0);

        REF_ASSERT_ISNT(ret < 0);

        if (ret == 0) {

        if (ret == 0) {

            CRYPTO_THREAD_lock_free(*lock);

            CRYPTO_THREAD_lock_free(*lock);

            *lock = NULL;

            *lock = NULL;

        }

        }

        break;

    }



    return ret;

    return ret;

}

}