upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-23 23:33:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9045 Do not share cn=config entries with outside code

Browse source 
config_back_entry_get currently returns the entry directly without
securing the rwlock, which is unsafe. However we can't keep holding it
on return in case the caller decides to hold onto the entry
indefinitely, hence rlock+entry_dup+runlock.
This commit is contained in:
Ondřej Kuzník 2022-10-26 15:55:18 +01:00 committed by Quanah Gibson-Mount
parent 2316927dc9
commit a6f3106afc
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
servers/slapd/bconfig.c
View file

@ -6862,7 +6862,6 @@ out:
return rs->sr_err;
}
/* no-op, we never free entries */
int config_entry_release(
Operation *op,
Entry *e,
@ -6882,6 +6881,8 @@ int config_entry_release(
} else {
entry_free( e );
}
} else {
entry_free( e );
}
return rc;
}
@ -6898,21 +6899,31 @@ int config_back_entry_get(
{
CfBackInfo *cfb;
CfEntryInfo *ce, *last;
int rc = LDAP_NO_SUCH_OBJECT;
Entry *e = NULL;
int locked = 0, rc = LDAP_NO_SUCH_OBJECT;
cfb = (CfBackInfo *)op->o_bd->be_private;
if ( !ldap_pvt_thread_pool_pausequery( &connection_pool ) ) {
ldap_pvt_thread_rdwr_rlock( &cfb->cb_rwlock );
locked = 1;
}
ce = config_find_base( cfb->cb_root, ndn, &last );
if ( ce ) {
*ent = ce->ce_entry;
if ( *ent ) {
e = ce->ce_entry;
if ( e ) {
rc = LDAP_SUCCESS;
if ( oc && !is_entry_objectclass_or_sub( *ent, oc ) ) {
if ( oc && !is_entry_objectclass_or_sub( e, oc ) ) {
rc = LDAP_NO_SUCH_ATTRIBUTE;
*ent = NULL;
e = NULL;
}
}
}
if ( e ) {
*ent = entry_dup( e );
}
if ( locked )
ldap_pvt_thread_rdwr_runlock( &cfb->cb_rwlock );
return rc;
}