This is an automated email from the git hooks/post-receive script.
lkrispen pushed a change to branch 389-ds-base-1.3.7 in repository 389-ds-base.
from 4b8fc4b Ticket 49495 - Fix memory management is vattr. new b8f1b19 Ticket 49493 - heap use after free in csn_as_string
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/slapd/back-ldbm/ldbm_add.c | 22 +--------------------- ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 ++++ ldap/servers/slapd/back-ldbm/ldbm_modify.c | 4 ++++ ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 4 ++++ ldap/servers/slapd/back-ldbm/misc.c | 18 ++++++++++++++++++ ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1 + 6 files changed, 32 insertions(+), 21 deletions(-)
This is an automated email from the git hooks/post-receive script.
lkrispen pushed a commit to branch 389-ds-base-1.3.7 in repository 389-ds-base.
commit b8f1b190ea31dde089021521bd56a0e76e25e904 Author: Ludwig Krispenz lkrispen@redhat.com Date: Tue Dec 12 12:46:37 2017 +0100
Ticket 49493 - heap use after free in csn_as_string
Bug: If write_changlog_and_ruv failed teh csn pending list was not properly cleand and references to the prim csn were kept, but the prim csn was reset
Fix: check the return code for the mmr postop plugin and aset error codes properly that will triger cancel_opcsn
Reviewed by: Thierry, thanks Tested by: Viktor, thanks --- ldap/servers/slapd/back-ldbm/ldbm_add.c | 22 +--------------------- ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 ++++ ldap/servers/slapd/back-ldbm/ldbm_modify.c | 4 ++++ ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 4 ++++ ldap/servers/slapd/back-ldbm/misc.c | 18 ++++++++++++++++++ ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1 + 6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c index b7e17ad..f29945a 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_add.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c @@ -22,7 +22,6 @@ extern char *hassubordinates;
static void delete_update_entrydn_operational_attributes(struct backentry *ep);
-static int set_error(Slapi_PBlock *pb, int retval, int ldap_result_code, char **ldap_result_message); #define ADD_SET_ERROR(rc, error, count) \ { \ (rc) = (error); \ @@ -1201,7 +1200,7 @@ ldbm_back_add(Slapi_PBlock *pb)
retval = plugin_call_mmr_plugin_postop(pb, NULL,SLAPI_PLUGIN_BE_TXN_POST_ADD_FN); if (retval) { - set_error(pb, retval, ldap_result_code, &ldap_result_message); + ldbm_set_error(pb, retval, &ldap_result_code, &ldap_result_message); goto error_return; }
@@ -1471,22 +1470,3 @@ delete_update_entrydn_operational_attributes(struct backentry *ep) slapi_entry_attr_delete(ep->ep_entry, LDBM_ENTRYDN_STR); }
-static int -set_error(Slapi_PBlock *pb, int retval, int ldap_result_code, char **ldap_result_message) -{ - int opreturn = 0; - if (!ldap_result_code) { - slapi_pblock_get(pb, SLAPI_RESULT_CODE, &ldap_result_code); - } - if (!ldap_result_code) { - ldap_result_code = LDAP_OPERATIONS_ERROR; - slapi_pblock_set(pb, SLAPI_RESULT_CODE, &ldap_result_code); - } - slapi_pblock_get(pb, SLAPI_PLUGIN_OPRETURN, &opreturn); - if (!opreturn) { - slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); - } - slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); - - return opreturn; -} diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index db463c1..be0db1b 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -1276,6 +1276,10 @@ replace_entry: }
retval = plugin_call_mmr_plugin_postop(pb, NULL,SLAPI_PLUGIN_BE_TXN_POST_DELETE_FN); + if (retval) { + ldbm_set_error(pb, retval, &ldap_result_code, &ldap_result_message); + goto error_return; + }
commit_return: /* Release SERIAL LOCK */ diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c index 7ee796f..cc4319e 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c @@ -867,6 +867,10 @@ ldbm_back_modify(Slapi_PBlock *pb) goto error_return; } retval = plugin_call_mmr_plugin_postop(pb, NULL,SLAPI_PLUGIN_BE_TXN_POST_MODIFY_FN); + if (retval) { + ldbm_set_error(pb, retval, &ldap_result_code, &ldap_result_message); + goto error_return; + }
/* Release SERIAL LOCK */ retval = dblayer_txn_commit(be, &txn); diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 2c0cb07..93fb77d 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -1211,6 +1211,10 @@ ldbm_back_modrdn(Slapi_PBlock *pb) goto error_return; } retval = plugin_call_mmr_plugin_postop(pb, NULL,SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN); + if (retval) { + ldbm_set_error(pb, retval, &ldap_result_code, &ldap_result_message); + goto error_return; + }
/* Release SERIAL LOCK */ retval = dblayer_txn_commit(be, &txn); diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c index df1afdf..c52e58a 100644 --- a/ldap/servers/slapd/back-ldbm/misc.c +++ b/ldap/servers/slapd/back-ldbm/misc.c @@ -16,6 +16,24 @@
#include "back-ldbm.h"
+void +ldbm_set_error(Slapi_PBlock *pb, int retval, int *ldap_result_code, char **ldap_result_message) +{ + int opreturn = 0; + if (!(*ldap_result_code)) { + slapi_pblock_get(pb, SLAPI_RESULT_CODE, ldap_result_code); + } + if (!(*ldap_result_code)) { + *ldap_result_code = LDAP_OPERATIONS_ERROR; + slapi_pblock_set(pb, SLAPI_RESULT_CODE, ldap_result_code); + } + slapi_pblock_get(pb, SLAPI_PLUGIN_OPRETURN, &opreturn); + if (!opreturn) { + slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, *ldap_result_code ? ldap_result_code : &retval); + } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, ldap_result_message); +} + /* Takes a return code supposed to be errno or from lidb which we don't expect to see and prints a handy log message */ void diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h index 0cee3df..da3eef1 100644 --- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h +++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h @@ -379,6 +379,7 @@ int ldbm_txn_ruv_modify_context(Slapi_PBlock *pb, modify_context *mc); int get_value_from_string(const char *string, char *type, char **value); int get_values_from_string(const char *string, char *type, char ***valuearray); void normalize_dir(char *dir); +void ldbm_set_error(Slapi_PBlock *pb, int retval, int *ldap_result_code, char **ldap_result_message);
/* * nextid.c
389-commits@lists.fedoraproject.org
-
git repository hosting