45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 959971b245f1676a2aa4d25d3a1d1898eda5b0a7 Mon Sep 17 00:00:00 2001
|
|
From: Howard Chu <hyc@openldap.org>
|
|
Date: Mon, 14 Dec 2020 20:05:44 +0000
|
|
Subject: [PATCH 222/224] ITS#9425 add more checks to ldap_X509dn2bv
|
|
|
|
---
|
|
libraries/libldap/tls2.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
|
|
index c642469d9..16c9d0487 100644
|
|
--- a/libraries/libldap/tls2.c
|
|
+++ b/libraries/libldap/tls2.c
|
|
@@ -1214,6 +1214,8 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
|
|
for ( tag = ber_first_element( ber, &len, &rdn_end );
|
|
tag == LBER_SEQUENCE;
|
|
tag = ber_next_element( ber, &len, rdn_end )) {
|
|
+ if ( rdn_end > dn_end )
|
|
+ return LDAP_DECODING_ERROR;
|
|
tag = ber_skip_tag( ber, &len );
|
|
ber_skip_data( ber, len );
|
|
navas++;
|
|
@@ -1223,7 +1225,7 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
|
|
/* Rewind and prepare to extract */
|
|
ber_rewind( ber );
|
|
tag = ber_first_element( ber, &len, &dn_end );
|
|
- if ( tag == LBER_DEFAULT )
|
|
+ if ( tag != LBER_SET )
|
|
return LDAP_DECODING_ERROR;
|
|
|
|
/* Allocate the DN/RDN/AVA stuff as a single block */
|
|
@@ -1336,6 +1338,10 @@ allocd:
|
|
/* X.690 bitString value converted to RFC4517 Bit String */
|
|
rc = der_to_ldap_BitString( &Val, &newAVA->la_value );
|
|
goto allocd;
|
|
+ case LBER_DEFAULT:
|
|
+ /* decode error */
|
|
+ rc = LDAP_DECODING_ERROR;
|
|
+ goto nomem;
|
|
default:
|
|
/* Not a string type at all */
|
|
newAVA->la_flags = 0;
|
|
--
|
|
2.30.0
|
|
|