[389-ds-base] branch master updated (0548490 -> c9151c2)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a change to branch master
in repository 389-ds-base.

from  0548490   Ticket 49290 - unindexed range searches don't provide notes=U
       new  c9151c2   Ticket 49284 - resolve crash in memberof when deleting attrs

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 ldap/servers/plugins/memberof/memberof_config.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

[389-ds-base] 01/01: Ticket 49284 - resolve crash in memberof when deleting attrs

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch master
in repository 389-ds-base.

commit c9151c28589801c30ec883e1c1a64ace53b6d20c
Author: William Brown 
Date:   Fri Jun 9 10:14:05 2017 +1000

Ticket 49284 - resolve crash in memberof when deleting attrs

Bug Description:  We were not reseting the entryScope and
    excludedScopes to NULL/count = 0 when we deleted the attributes.
    This would cause a heap use after free, which mean invalid data
    may have been avaliable to the server causing a later segfault.

Fix Description:  When we do not have an entry scope, guarantee
    we reset it to NULL/0.

https://pagure.io/389-ds-base/issue/49284

Author: wibrown

Review by: mreynolds (Thanks!)
---
 ldap/servers/plugins/memberof/memberof_config.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ldap/servers/plugins/memberof/memberof_config.c b/ldap/servers/plugins/memberof/memberof_config.c
index c1bba2f..61250af 100644
--- a/ldap/servers/plugins/memberof/memberof_config.c
+++ b/ldap/servers/plugins/memberof/memberof_config.c
@@ -69,15 +69,15 @@ static int dont_allow_that(Slapi_PBlock *pb __attribute__((unused)),
 }

static void
-memberof_free_scope(Slapi_DN **scopes, int *count)
+memberof_free_scope(Slapi_DN ***scopes, int *count)
 {
    size_t i = 0;

-	while(scopes && scopes[i]){
-		slapi_sdn_free(&scopes[i]);
+	while(*scopes && (*scopes)[i]){
+		slapi_sdn_free(&(*scopes)[i]);
    	i++;
    }
-	slapi_ch_free((void**)&scopes);
+	slapi_ch_free((void**)scopes);
    *count = 0;
 }

@@ -440,8 +440,8 @@ memberof_validate_config (Slapi_PBlock *pb,
    }

done:
-	memberof_free_scope(exclude_dn, &num_vals);
-	memberof_free_scope(include_dn,	&num_vals);
+	memberof_free_scope(&exclude_dn, &num_vals);
+	memberof_free_scope(&include_dn,	&num_vals);
    slapi_ch_free((void**)&entry_scopes);
    slapi_ch_free((void**)&entry_exclude_scopes);
    slapi_sdn_free(&config_sdn);
@@ -654,7 +654,7 @@ memberof_apply_config (Slapi_PBlock *pb __attribute__((unused)),
    /*
     * Check and process the entry scopes
     */
-	memberof_free_scope(theConfig.entryScopes, &theConfig.entryScopeCount);
+	memberof_free_scope(&(theConfig.entryScopes), &theConfig.entryScopeCount);
    entryScopes = slapi_entry_attr_get_charray_ext(e, MEMBEROF_ENTRY_SCOPE_ATTR, &num_vals);
    if(entryScopes){
    	int i = 0;
@@ -669,7 +669,7 @@ memberof_apply_config (Slapi_PBlock *pb __attribute__((unused)),
    /*
     * Check and process the entry exclude scopes
     */
-	memberof_free_scope(theConfig.entryScopeExcludeSubtrees,
+	memberof_free_scope(&(theConfig.entryScopeExcludeSubtrees),
                        &theConfig.entryExcludeScopeCount);
    entryScopeExcludeSubtrees =
        slapi_entry_attr_get_charray_ext(e, MEMBEROF_ENTRY_SCOPE_EXCLUDE_SUBTREE, &num_vals);
@@ -824,8 +824,8 @@ memberof_free_config(MemberOfConfig *config)
    	slapi_ch_free((void **)&config->group_slapiattrs);
    	slapi_ch_free_string(&config->auto_add_oc);
    	slapi_ch_free_string(&config->memberof_attr);
-		memberof_free_scope(config->entryScopes, &config->entryScopeCount);
-		memberof_free_scope(config->entryScopeExcludeSubtrees, &config->entryExcludeScopeCount);
+		memberof_free_scope(&(config->entryScopes), &config->entryScopeCount);
+		memberof_free_scope(&(config->entryScopeExcludeSubtrees), &config->entryExcludeScopeCount);
    }
 }