389-commits August 2019

389-commits@lists.fedoraproject.org

1 participants
38 discussions

[389-ds-base] branch 389-ds-base-1.4.0 updated: Issue 50499 - Audit fix - Update npm 'eslint-utils' version
by pagure＠pagure.io 27 Aug '19

27 Aug '19

This is an automated email from the git hooks/post-receive script. spichugi pushed a commit to branch 389-ds-base-1.4.0 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push: new 825f06e Issue 50499 - Audit fix - Update npm 'eslint-utils' version 825f06e is described below commit 825f06e4f14b712ca90a43bffabc808cae4d30c4 Author: Simon Pichugin <spichugi(a)redhat.com> AuthorDate: Fri Aug 23 09:54:09 2019 +0200 Issue 50499 - Audit fix - Update npm 'eslint-utils' version Description: Versions of `eslint-utils` >=1.2.0 or <1.4.1 are vulnerable to Arbitrary Code Execution. Update the version. https://pagure.io/389-ds-base/issue/50499 Reviewed by: ? --- src/cockpit/389-console/package-lock.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/cockpit/389-console/package-lock.json b/src/cockpit/389-console/package-lock.json index 9fec71c..f8ca714 100644 --- a/src/cockpit/389-console/package-lock.json +++ b/src/cockpit/389-console/package-lock.json @@ -3739,10 +3739,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", @@ -6124,7 +6127,7 @@ }, "moment-timezone": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz", + "resolved": "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz", "integrity": "sha1-gfWYw61eIs2teWtn7NjYjQ9bqgY=", "optional": true, "requires": { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch master updated: Issue 50506 - Fix regression from slapi_entry_attr_get_ref refactor
by pagure＠pagure.io 23 Aug '19

23 Aug '19

This is an automated email from the git hooks/post-receive script. mreynolds pushed a commit to branch master in repository 389-ds-base. The following commit(s) were added to refs/heads/master by this push: new e378092 Issue 50506 - Fix regression from slapi_entry_attr_get_ref refactor e378092 is described below commit e3780926368bdcdbcfac86a154e55706d3dc0c8f Author: Mark Reynolds <mreynolds(a)redhat.com> AuthorDate: Fri Aug 23 11:27:27 2019 -0400 Issue 50506 - Fix regression from slapi_entry_attr_get_ref refactor Description: In pwenc.c we took a reference to the attribute value, but it was freed before we looked at it. relates: https://pagure.io/389-ds-base/issue/50506 Regviewed by: mreynolds (one line commit rule) --- ldap/servers/slapd/tools/pwenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ldap/servers/slapd/tools/pwenc.c b/ldap/servers/slapd/tools/pwenc.c index fe7f2a5..1629c06 100644 --- a/ldap/servers/slapd/tools/pwenc.c +++ b/ldap/servers/slapd/tools/pwenc.c @@ -362,7 +362,8 @@ slapd_config(const char *configdir, const char *givenconfigfile) } } else if (slapi_sdn_compare(&config_dn, slapi_entry_get_sdn_const(e)) == 0) { /* Get the root scheme out and initialise it (if it exists) */ - rootschemename = (char *)slapi_entry_attr_get_ref(e, CONFIG_ROOTPWSTORAGESCHEME_ATTRIBUTE); + slapi_ch_free_string(&rootschemename); + rootschemename = slapi_entry_attr_get_charptr(e, CONFIG_ROOTPWSTORAGESCHEME_ATTRIBUTE); } slapi_entry_free(e); @@ -382,6 +383,7 @@ slapd_config(const char *configdir, const char *givenconfigfile) if (rootschemename != NULL) { config_set_rootpwstoragescheme(CONFIG_ROOTPWSTORAGESCHEME_ATTRIBUTE, rootschemename, NULL, 1); + slapi_ch_free_string(&rootschemename); } slapi_ch_free_string(&buf); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch 389-ds-base-1.3.8 updated: Issue 49624 - modrdn silently fails if DB deadlock occurs
by pagure＠pagure.io 22 Aug '19

22 Aug '19

This is an automated email from the git hooks/post-receive script. mreynolds pushed a commit to branch 389-ds-base-1.3.8 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.3.8 by this push: new 2855482 Issue 49624 - modrdn silently fails if DB deadlock occurs 2855482 is described below commit 2855482a6fa910db5037be4a19f4e7f6b207907b Author: Mark Reynolds <mreynolds(a)redhat.com> AuthorDate: Thu Aug 22 10:26:24 2019 -0400 Issue 49624 - modrdn silently fails if DB deadlock occurs Bug Description: If a DB Deadlock error occurs during a modrdn operation the entry cache gets updated (corrupted), but the update is not applied to the database. Fix Description: Looks like there was a copy & paste error, and the wrong attribute was updated during the retry of the modrdn operation. relates: https://pagure.io/389-ds-base/issue/49624 Reviewed by: lkrispenz (Thanks!) --- ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 4fff35a..1be9a59 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -251,7 +251,7 @@ ldbm_back_modrdn(Slapi_PBlock *pb) slapi_pblock_get(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &dn_newsuperiordn); slapi_sdn_free(&dn_newsuperiordn); slapi_pblock_set(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, orig_dn_newsuperiordn); - orig_dn_newsuperiordn = slapi_sdn_dup(orig_dn_newsuperiordn); + dn_newsuperiordn = slapi_sdn_dup(orig_dn_newsuperiordn); /* must duplicate ec before returning it to cache, * which could free the entry. */ if ((tmpentry = backentry_dup(original_entry ? original_entry : ec)) == NULL) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch 389-ds-base-1.3.9 updated: Issue 49624 - modrdn silently fails if DB deadlock occurs
by pagure＠pagure.io 22 Aug '19

22 Aug '19

This is an automated email from the git hooks/post-receive script. mreynolds pushed a commit to branch 389-ds-base-1.3.9 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.3.9 by this push: new 40c9a5a Issue 49624 - modrdn silently fails if DB deadlock occurs 40c9a5a is described below commit 40c9a5a4dada35c40bd0b4b29f602ad9cb6ba7f1 Author: Mark Reynolds <mreynolds(a)redhat.com> AuthorDate: Thu Aug 22 10:26:24 2019 -0400 Issue 49624 - modrdn silently fails if DB deadlock occurs Bug Description: If a DB Deadlock error occurs during a modrdn operation the entry cache gets updated (corrupted), but the update is not applied to the database. Fix Description: Looks like there was a copy & paste error, and the wrong attribute was updated during the retry of the modrdn operation. relates: https://pagure.io/389-ds-base/issue/49624 Reviewed by: lkrispenz (Thanks!) --- ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 65610d6..433ed88 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -251,7 +251,7 @@ ldbm_back_modrdn(Slapi_PBlock *pb) slapi_pblock_get(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &dn_newsuperiordn); slapi_sdn_free(&dn_newsuperiordn); slapi_pblock_set(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, orig_dn_newsuperiordn); - orig_dn_newsuperiordn = slapi_sdn_dup(orig_dn_newsuperiordn); + dn_newsuperiordn = slapi_sdn_dup(orig_dn_newsuperiordn); /* must duplicate ec before returning it to cache, * which could free the entry. */ if ((tmpentry = backentry_dup(original_entry ? original_entry : ec)) == NULL) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch 389-ds-base-1.3.10 updated: Issue 49624 - modrdn silently fails if DB deadlock occurs
by pagure＠pagure.io 22 Aug '19

22 Aug '19

1 0

[389-ds-base] branch 389-ds-base-1.4.0 updated: Issue 49624 - modrdn silently fails if DB deadlock occurs
by pagure＠pagure.io 22 Aug '19

22 Aug '19

This is an automated email from the git hooks/post-receive script. mreynolds pushed a commit to branch 389-ds-base-1.4.0 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push: new ab03ec6 Issue 49624 - modrdn silently fails if DB deadlock occurs ab03ec6 is described below commit ab03ec6c0c69ab06a07b89194738a10a529e546a Author: Mark Reynolds <mreynolds(a)redhat.com> AuthorDate: Thu Aug 22 10:26:24 2019 -0400 Issue 49624 - modrdn silently fails if DB deadlock occurs Bug Description: If a DB Deadlock error occurs during a modrdn operation the entry cache gets updated (corrupted), but the update is not applied to the database. Fix Description: Looks like there was a copy & paste error, and the wrong attribute was updated during the retry of the modrdn operation. relates: https://pagure.io/389-ds-base/issue/49624 Reviewed by: lkrispenz (Thanks!) --- ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 65610d6..433ed88 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -251,7 +251,7 @@ ldbm_back_modrdn(Slapi_PBlock *pb) slapi_pblock_get(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &dn_newsuperiordn); slapi_sdn_free(&dn_newsuperiordn); slapi_pblock_set(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, orig_dn_newsuperiordn); - orig_dn_newsuperiordn = slapi_sdn_dup(orig_dn_newsuperiordn); + dn_newsuperiordn = slapi_sdn_dup(orig_dn_newsuperiordn); /* must duplicate ec before returning it to cache, * which could free the entry. */ if ((tmpentry = backentry_dup(original_entry ? original_entry : ec)) == NULL) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch 389-ds-base-1.3.10 updated: fix for 50542 crashes in filter tests
by pagure＠pagure.io 22 Aug '19

22 Aug '19

1 0

[389-ds-base] branch 389-ds-base-1.3.10 updated: Ticket 50542 - Entry cache contention during base search
by pagure＠pagure.io 22 Aug '19

22 Aug '19

This is an automated email from the git hooks/post-receive script. mreynolds pushed a commit to branch 389-ds-base-1.3.10 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.3.10 by this push: new d871134 Ticket 50542 - Entry cache contention during base search d871134 is described below commit d8711348270f57804c942fd9c6ecececc6c5867a Author: Thierry Bordaz <tbordaz(a)redhat.com> AuthorDate: Thu Aug 8 12:05:00 2019 +0200 Ticket 50542 - Entry cache contention during base search Bug Description: During a base search the entry cache lock is acquired to retrieve the target entry. Later when the candidate list is built, the entry cache lock is also acquired to retrieve the candidate that is actually the target entry itself So for a base search the entry cache lock is accessed 4 times (2 acquires + 2 releases) It is very easy to create a huge contention (e.g. dereferencing large group) increasing etime Fix Description: The idea is to acquire the entry, from the entry cache (with refcnt++) when searching the base search. Then instead of returning the entry (refcnt--) the entry is kept in the operation until the operation completes. If later we need the entry (to send it back to the client), the entry is picked up from the operation not from the entry cache lookup https://pagure.io/389-ds-base/issue/50542 Reviewed by: Ludwig Krispenz, William Brown Platforms tested: F29 Flag Day: no Doc impact: no --- ldap/servers/slapd/back-ldbm/ldbm_search.c | 45 ++++++++++++++++++++++++++---- ldap/servers/slapd/operation.c | 32 +++++++++++++++++++++ ldap/servers/slapd/opshared.c | 36 ++++++++++++++++++++++-- ldap/servers/slapd/proto-slap.h | 4 +++ ldap/servers/slapd/slap.h | 9 ++++++ 5 files changed, 118 insertions(+), 8 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c index 8f31118..c8f5719 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_search.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c @@ -551,6 +551,13 @@ ldbm_back_search(Slapi_PBlock *pb) LDBM_SRCH_DEFAULT_RESULT, NULL, 1, &vlv_request_control, NULL, candidates); } } + /* We have the base search entry and a callback to "cache_return" it. + * Keep it into the operation to avoid additional cache fetch/return + */ + if (e && be->be_entry_release) { + operation_set_target_entry(operation, (void *) e); + operation_set_target_entry_id(operation, e->ep_id); + } /* * If this is a persistent search then the client is only @@ -807,7 +814,6 @@ ldbm_back_search(Slapi_PBlock *pb) } } - CACHE_RETURN(&inst->inst_cache, &e); /* * if the candidate list is an allids list, arrange for access log @@ -1345,6 +1351,27 @@ ldbm_back_next_search_entry(Slapi_PBlock *pb) return ldbm_back_next_search_entry_ext(pb, 0); } +/* The reference on the target_entry (base search) is stored in the operation + * This is to prevent additional cache find/return that require cache lock. + * + * The target entry is acquired during be->be_search (when building the candidate list). + * and is returned once the operation completes (or fail). + * + * The others entries sent back to the client have been acquired/returned during send_results_ext. + * If the target entry is sent back to the client it is not returned (refcnt--) during the send_results_ext. + * + * This function returns(refcnt-- in the entry cache) the entry unless it is + * the target_entry (base search). target_entry will be return once the operation + * completes + */ +static void +non_target_cache_return(Slapi_Operation *op, struct cache *cache, struct backentry **e) +{ + if (e && (*e != operation_get_target_entry(op))) { + CACHE_RETURN(cache, e); + } +} + int ldbm_back_next_search_entry_ext(Slapi_PBlock *pb, int use_extension) { @@ -1447,7 +1474,7 @@ ldbm_back_next_search_entry_ext(Slapi_PBlock *pb, int use_extension) /* If we are using the extension, the front end will tell * us when to do this so we don't do it now */ if (sr->sr_entry && !use_extension) { - CACHE_RETURN(&inst->inst_cache, &(sr->sr_entry)); + non_target_cache_return(op, &inst->inst_cache, &(sr->sr_entry)); sr->sr_entry = NULL; } @@ -1559,7 +1586,13 @@ ldbm_back_next_search_entry_ext(Slapi_PBlock *pb, int use_extension) } /* get the entry */ - e = id2entry(be, id, &txn, &err); + e = operation_get_target_entry(op); + if ((e == NULL) || (id != operation_get_target_entry_id(op))) { + /* if the entry is not the target_entry (base search) + * we need to fetch it from the entry cache (it was not + * referenced in the operation) */ + e = id2entry(be, id, &txn, &err); + } if (e == NULL) { if (err != 0 && err != DB_NOTFOUND) { slapi_log_err(SLAPI_LOG_ERR, "ldbm_back_next_search_entry_ext", "next_search_entry db err %d\n", @@ -1679,7 +1712,7 @@ ldbm_back_next_search_entry_ext(Slapi_PBlock *pb, int use_extension) /* check size limit */ if (slimit >= 0) { if (--slimit < 0) { - CACHE_RETURN(&inst->inst_cache, &e); + non_target_cache_return(op, &inst->inst_cache, &e); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET_SIZE_ESTIMATE, &estimate); delete_search_result_set(pb, &sr); slapi_send_ldap_result(pb, LDAP_SIZELIMIT_EXCEEDED, NULL, NULL, nentries, urls); @@ -1717,12 +1750,12 @@ ldbm_back_next_search_entry_ext(Slapi_PBlock *pb, int use_extension) rc = 0; goto bail; } else { - CACHE_RETURN(&inst->inst_cache, &(sr->sr_entry)); + non_target_cache_return(op, &inst->inst_cache, &(sr->sr_entry)); sr->sr_entry = NULL; } } else { /* Failed the filter test, and this isn't a VLV Search */ - CACHE_RETURN(&inst->inst_cache, &(sr->sr_entry)); + non_target_cache_return(op, &inst->inst_cache, &(sr->sr_entry)); sr->sr_entry = NULL; if (LDAP_UNWILLING_TO_PERFORM == filter_test) { /* Need to catch this error to detect the vattr loop */ diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c index 4a05e0a..8186fd3 100644 --- a/ldap/servers/slapd/operation.c +++ b/ldap/servers/slapd/operation.c @@ -354,6 +354,38 @@ operation_is_flag_set(Slapi_Operation *op, int flag) return op->o_flags & flag; } +void * +operation_get_target_entry(Slapi_Operation *op) +{ + PR_ASSERT(op); + + return op->o_target_entry; +} + +void +operation_set_target_entry(Slapi_Operation *op, void *target_entry) +{ + PR_ASSERT(op); + + op->o_target_entry = target_entry; +} + +u_int32_t +operation_get_target_entry_id(Slapi_Operation *op) +{ + PR_ASSERT(op); + + return op->o_target_entry_id; +} + +void +operation_set_target_entry_id(Slapi_Operation *op, u_int32_t target_entry_id) +{ + PR_ASSERT(op); + + op->o_target_entry_id = target_entry_id; +} + Slapi_DN * operation_get_target_spec(Slapi_Operation *op) { diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index cf6cdff..b9fc835 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -193,6 +193,28 @@ slapi_attr_is_last_mod(char *attr) return 0; } +/* The reference on the target_entry (base search) is stored in the operation + * This is to prevent additional cache find/return that require cache lock. + * + * The target entry is acquired during be->be_search (when building the candidate list). + * and is returned once the operation completes (or fail). + * + * The others entries sent back to the client have been acquired/returned during send_results_ext. + * If the target entry is sent back to the client it is not returned (refcnt--) during the send_results_ext. + * + * This function only returns (refcnt-- in the entry cache) the target_entry (base search). + * It is called at the operation level (op_shared_search) + * + */ +static void +cache_return_target_entry(Slapi_PBlock *pb, Slapi_Backend *be, Slapi_Operation *operation) +{ + if (operation_get_target_entry(operation) && be->be_entry_release) { + (*be->be_entry_release)(pb, operation_get_target_entry(operation)); + operation_set_target_entry(operation, NULL); + operation_set_target_entry_id(operation, 0); + } +} /* * Returns: 0 - if the operation is successful * < 0 - if operation fails. @@ -252,6 +274,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) /* get search parameters */ slapi_pblock_get(pb, SLAPI_ORIGINAL_TARGET_DN, &base); slapi_pblock_get(pb, SLAPI_SEARCH_TARGET_SDN, &sdn); + slapi_pblock_get(pb, SLAPI_OPERATION, &operation); if (NULL == sdn) { sdn = slapi_sdn_new_dn_byval(base); @@ -276,7 +299,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) slapi_pblock_get(pb, SLAPI_SEARCH_SCOPE, &scope); slapi_pblock_get(pb, SLAPI_SEARCH_STRFILTER, &fstr); slapi_pblock_get(pb, SLAPI_SEARCH_ATTRS, &attrs); - slapi_pblock_get(pb, SLAPI_OPERATION, &operation); + if (operation == NULL) { op_shared_log_error_access(pb, "SRCH", base, "NULL operation"); send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL, "NULL operation", 0, NULL); @@ -808,6 +831,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) * the error has already been sent * stop the search here */ + cache_return_target_entry(pb, be, operation); goto free_and_return; } @@ -815,6 +839,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) case SLAPI_FAIL_DISKFULL: operation_out_of_disk_space(); + cache_return_target_entry(pb, be, operation); goto free_and_return; case 0: /* search was successful and we need to send the result */ @@ -840,6 +865,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) /* no more entries && no more backends */ curr_search_count = -1; } else if (rc < 0) { + cache_return_target_entry(pb, be, operation); goto free_and_return; } } else { @@ -852,6 +878,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) (pagedresults_set_search_result_set_size_estimate(pb_conn, operation, estimate, pr_idx) < 0) || (pagedresults_set_with_sort(pb_conn, operation, with_sort, pr_idx) < 0)) { pagedresults_unlock(pb_conn, pr_idx); + cache_return_target_entry(pb, be, operation); goto free_and_return; } pagedresults_unlock(pb_conn, pr_idx); @@ -867,6 +894,7 @@ op_shared_search(Slapi_PBlock *pb, int send_result) pagedresults_set_response_control(pb, 0, estimate, -1, pr_idx); send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL); rc = LDAP_SUCCESS; + cache_return_target_entry(pb, be, operation); goto free_and_return; } pagedresults_set_response_control(pb, 0, estimate, curr_search_count, pr_idx); @@ -880,10 +908,14 @@ op_shared_search(Slapi_PBlock *pb, int send_result) * LDAP error should already have been sent to the client * stop the search, free and return */ - if (rc != 0) + if (rc != 0) { + cache_return_target_entry(pb, be, operation); goto free_and_return; + } break; } + /* cache return the target_entry */ + cache_return_target_entry(pb, be, operation); } nentries += pnentries; diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index e37f702..d9fb8fd 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -873,6 +873,10 @@ void operation_free(Slapi_Operation **op, Connection *conn); int slapi_op_abandoned(Slapi_PBlock *pb); void operation_out_of_disk_space(void); int get_operation_object_type(void); +void *operation_get_target_entry(Slapi_Operation *op); +void operation_set_target_entry(Slapi_Operation *op, void *target_void); +u_int32_t operation_get_target_entry_id(Slapi_Operation *op); +void operation_set_target_entry_id(Slapi_Operation *op, u_int32_t target_entry_id); Slapi_DN *operation_get_target_spec(Slapi_Operation *op); void operation_set_target_spec(Slapi_Operation *op, const Slapi_DN *target_spec); void operation_set_target_spec_str(Slapi_Operation *op, const char *target_spec); diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h index bce7209..a8908d9 100644 --- a/ldap/servers/slapd/slap.h +++ b/ldap/servers/slapd/slap.h @@ -1545,6 +1545,15 @@ typedef struct op unsigned long o_flags; /* flags for this operation */ void *o_extension; /* plugins are able to extend the Operation object */ Slapi_DN *o_target_spec; /* used to decide which plugins should be called for the operation */ + void *o_target_entry; /* Only used for SEARCH operation + * reference of search target entry (base search) in the entry cache + * When it is set the refcnt (of the entry in the entry cache) as been increased + */ + u_int32_t o_target_entry_id; /* Only used for SEARCH operation + * contains the ID of the o_target_entry. In send_result we have ID of the candidates, this + * accelerates the tests as we have not to retrieve for each candidate the + * ep_id inside the o_target_entry. + */ unsigned long o_abandoned_op; /* operation abandoned by this operation - used to decide which plugins to invoke */ struct slapi_operation_parameters o_params; struct slapi_operation_results o_results; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch 389-ds-base-1.3.9 updated: fix for 50542 crashes in filter tests
by pagure＠pagure.io 22 Aug '19

22 Aug '19

This is an automated email from the git hooks/post-receive script. lkrispen pushed a commit to branch 389-ds-base-1.3.9 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.3.9 by this push: new 2c1bd9a fix for 50542 crashes in filter tests 2c1bd9a is described below commit 2c1bd9a3ca59c71096be2c6574ec14506db778e6 Author: Ludwig Krispenz <lkrispen(a)redhat.com> AuthorDate: Tue Aug 20 10:18:22 2019 +0200 fix for 50542 crashes in filter tests The crash is when a backentry is released, there is a call to CACHE_RETURN and then check and free of a vlv entry. But CACHE_RETURN, under some conditions, can free the backentry - the following check will dereference a NULL entry and crashes Fix: Reverse the order of freeing vlv entry and returning entry to cache Note: Viktor did successfully runthe tests, thanks Reviewed by: ? --- ldap/servers/slapd/back-ldbm/ldbm_search.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c index c8f5719..2ad8f74 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_search.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c @@ -1896,13 +1896,13 @@ ldbm_back_entry_release(Slapi_PBlock *pb, void *backend_info_ptr) slapi_pblock_get(pb, SLAPI_BACKEND, &be); inst = (ldbm_instance *)be->be_instance_info; - CACHE_RETURN(&inst->inst_cache, (struct backentry **)&backend_info_ptr); - if (((struct backentry *)backend_info_ptr)->ep_vlventry != NULL) { /* This entry was created during a vlv search whose acl check failed. It needs to be * freed here */ slapi_entry_free(((struct backentry *)backend_info_ptr)->ep_vlventry); ((struct backentry *)backend_info_ptr)->ep_vlventry = NULL; } + CACHE_RETURN(&inst->inst_cache, (struct backentry **)&backend_info_ptr); + return 0; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[389-ds-base] branch 389-ds-base-1.4.0 updated: fix for 50542 crashes in filter tests
by pagure＠pagure.io 22 Aug '19

22 Aug '19

This is an automated email from the git hooks/post-receive script. lkrispen pushed a commit to branch 389-ds-base-1.4.0 in repository 389-ds-base. The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push: new 2672461 fix for 50542 crashes in filter tests 2672461 is described below commit 26724618dd15a710861e2b85ccf1a201bad07a8d Author: Ludwig Krispenz <lkrispen(a)redhat.com> AuthorDate: Tue Aug 20 10:18:22 2019 +0200 fix for 50542 crashes in filter tests The crash is when a backentry is released, there is a call to CACHE_RETURN and then check and free of a vlv entry. But CACHE_RETURN, under some conditions, can free the backentry - the following check will dereference a NULL entry and crashes Fix: Reverse the order of freeing vlv entry and returning entry to cache Note: Viktor did successfully runthe tests, thanks Reviewed by: ? --- ldap/servers/slapd/back-ldbm/ldbm_search.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c index 7e1c52d..f300468 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_search.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c @@ -1909,13 +1909,13 @@ ldbm_back_entry_release(Slapi_PBlock *pb, void *backend_info_ptr) slapi_pblock_get(pb, SLAPI_BACKEND, &be); inst = (ldbm_instance *)be->be_instance_info; - CACHE_RETURN(&inst->inst_cache, (struct backentry **)&backend_info_ptr); - if (((struct backentry *)backend_info_ptr)->ep_vlventry != NULL) { /* This entry was created during a vlv search whose acl check failed. It needs to be * freed here */ slapi_entry_free(((struct backentry *)backend_info_ptr)->ep_vlventry); ((struct backentry *)backend_info_ptr)->ep_vlventry = NULL; } + CACHE_RETURN(&inst->inst_cache, (struct backentry **)&backend_info_ptr); + return 0; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits August 2019