Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 6453 - Fix memory leaks in entryrdn #6455

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue 6453 - Fix memory leaks in entryrdn #6455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,7 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
dbi_entryrdn_records_t rec = {0};
int rc = 0;
int dbop = 0;
void *prev_elem_data = NULL;

if (NULL == ctx || NULL == key || NULL == data || NULL == elem ||
NULL == comp_key) {
Expand Down Expand Up @@ -1544,8 +1545,14 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
/* Position cursor at the matching key */
*elem = NULL;
dbop = DBI_OP_MOVE_NEAR_DATA;

retry_get:
if (*elem) {
/* free the previous elem data */
slapi_ch_free((void**)&prev_elem_data);
}
Comment on lines +1550 to +1553
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we also need to check and free it at the bail: section

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we also need to check and free it at the bail: section

Maybe :-) Like I said this code is a bit tricky when it comes to handling long DN's vs not long DN's. I'll try and force some failures and see what happens...

rc = dblayer_cursor_op(&ctx->cursor, dbop, key, data);
prev_elem_data = data->data; /* save pointer to data so we can free it on a retry */
*elem = (rdn_elem *)data->data;
dblayer_value_init(ctx->be, data);

Expand Down Expand Up @@ -1574,6 +1581,7 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
}
if (*elem && RDN_IS_REDIRECT(*elem)) {
rc = _entryrdn_resolve_redirect(ctx, elem, 1);
prev_elem_data = *elem;
if (rc) {
_ENTRYRDN_DEBUG_GOTO_BAIL();
goto bail;
Expand Down Expand Up @@ -1602,13 +1610,21 @@ _entryrdn_get_elem(entryrdn_db_ctx_t *ctx,
_ENTRYRDN_DEBUG_GOTO_BAIL();
goto bail;
}

bail:
if (rec.redirect) {
dblayer_value_free(ctx->be, &rec.redirect_data);
dblayer_value_free(ctx->be, &rec.redirect_key);
}
if (*elem) {
slapi_log_err(SLAPI_LOG_TRACE, "_entryrdn_get_elem", "<-- _entryrdn_get_elem (*elem rdn=%s) rc=%d\n",
RDN_ADDR(*elem), rc);
} else {
slapi_log_err(SLAPI_LOG_TRACE, "_entryrdn_get_elem", "<-- _entryrdn_get_elem (*elem NULL) rc=%d\n", rc);
}
if (rc) {
slapi_ch_free((void**)elem);
}
return rc;
}

Expand Down Expand Up @@ -1695,12 +1711,18 @@ _entryrdn_get_tombstone_elem(entryrdn_db_ctx_t *ctx,
if (0 == strcmp(comma + 1, slapi_rdn_get_nrdn(srdn))) {
/* found and done */
_entryrdn_dup_rdn_elem((const void *)dataret.data, elem);
if (RDN_IS_REDIRECT(childelem)) {
slapi_ch_free((void **)&childelem);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this sounds suspicious because childelem is an array elems ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this sounds suspicious because childelem is an array elems ...

It fixes the leak. Note childelem and dataret.data point to the same address. I just chose to use childelem.

}
goto bail;
}
if (0 == strncmp(childnrdn, slapi_rdn_get_nrdn(srdn),
comma - childnrdn)) {
/* found and done */
_entryrdn_dup_rdn_elem((const void *)dataret.data, elem);
if (RDN_IS_REDIRECT(childelem)) {
slapi_ch_free((void **)&childelem);
}
_ENTRYRDN_DEBUG_GOTO_BAIL();
goto bail;
}
Expand Down Expand Up @@ -3101,7 +3123,7 @@ _entryrdn_index_read(entryrdn_db_ctx_t *ctx,
if (childelems) {
break; /* get the child elems */
} else {
/* We got the targetelem.
/* We got the targetelem.
* And we don't have to gather childelems, so we can return. */
#ifdef LDAP_DEBUG_ENTRYRDN
char *dn = NULL;
Expand Down
Loading