ITS#7270 Protect accesses to ldap_int_hostname with a mutex.

Not protecting the accesses to ldap_int_hostname could lead to a double
free.

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 9d37e6493964468e7c2ee86cc5881a6d88764a2c..1247bbb9f9f23b20b6563e730cd0be8320ed6196 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -642,6 +642,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 
 #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
        {
+               LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
                char    *name = ldap_int_hostname;
 
                ldap_int_hostname = ldap_pvt_get_fqdn( name );
@@ -649,6 +650,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
                if ( name != NULL && name != ldap_int_hostname ) {
                        LDAP_FREE( name );
                }
+               LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
        }
 #endif
 

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index ad37250ad15a31762f0ec09fcc28ca7650942c82..be824e4e825bb5ecafce2bec7932fc8264352b62 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -488,6 +488,7 @@ struct ldap {
 
 #ifdef LDAP_R_COMPILE
 LDAP_V ( ldap_pvt_thread_mutex_t ) ldap_int_resolv_mutex;
+LDAP_V ( ldap_pvt_thread_mutex_t ) ldap_int_hostname_mutex;
 
 #ifdef HAVE_CYRUS_SASL
 LDAP_V( ldap_pvt_thread_mutex_t ) ldap_int_sasl_mutex;

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 85f13fcedd72d874bf11f798e329bd8b2b1d1aee..f451cc541c05fcecb6711ac6ca245fc8c5441ee4 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -58,6 +58,7 @@ extern int h_errno;
 #else
 # include <ldap_pvt_thread.h>
   ldap_pvt_thread_mutex_t ldap_int_resolv_mutex;
+  ldap_pvt_thread_mutex_t ldap_int_hostname_mutex;
 
 # if (defined( HAVE_CTIME_R ) || defined( HAVE_REENTRANT_FUNCTIONS)) \
         && defined( CTIME_R_NARGS )
@@ -603,6 +604,8 @@ void ldap_int_utils_init( void )
 #endif
        ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
 
+       ldap_pvt_thread_mutex_init( &ldap_int_hostname_mutex );
+
 #ifdef HAVE_CYRUS_SASL
        ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
 #endif