Fix several mem leaks in ldb_index ldb_search ldb_tdb

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13475

Signed-off-by: Andrej Gessel <Andrej.Gessel@janztec.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jun 15 23:07:25 CEST 2018 on sn-devel-144

diff --git a/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c
index 04ffbad65cdb88058abeb1a155c1faf2a9af4e82..d59b4b16290838b66bc75758cc018fe19115c14a 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_index.c
+++ b/lib/ldb/ldb_tdb/ldb_index.c
@@ -416,6 +416,7 @@ normal_index:
                                      "expected %d for %s",
                                      version, LTDB_INDEXING_VERSION,
                                      ldb_dn_get_linearized(dn));
+                       talloc_free(msg);
                        return LDB_ERR_OPERATIONS_ERROR;
                }
 
@@ -433,14 +434,17 @@ normal_index:
                                      "expected %d for %s",
                                      version, LTDB_GUID_INDEXING_VERSION,
                                      ldb_dn_get_linearized(dn));
+                       talloc_free(msg);
                        return LDB_ERR_OPERATIONS_ERROR;
                }
 
                if (el->num_values == 0) {
+                       talloc_free(msg);
                        return LDB_ERR_OPERATIONS_ERROR;
                }
 
                if ((el->values[0].length % LTDB_GUID_SIZE) != 0) {
+                       talloc_free(msg);
                        return LDB_ERR_OPERATIONS_ERROR;
                }
 
@@ -521,6 +525,7 @@ int ltdb_key_dn_from_idx(struct ldb_module *module,
                        const int flags = LDB_UNPACK_DATA_FLAG_NO_ATTRS;
                        struct ldb_message *rec = ldb_msg_new(ldb);
                        if (rec == NULL) {
+                               TALLOC_FREE(list);
                                return LDB_ERR_OPERATIONS_ERROR;
                        }
 

diff --git a/lib/ldb/ldb_tdb/ldb_search.c b/lib/ldb/ldb_tdb/ldb_search.c
index cfc37149399be98b8a8585874ce5e3a22a8c6627..18f84056e663ee69233bc7d4e1b6bbe3389100a3 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_search.c
+++ b/lib/ldb/ldb_tdb/ldb_search.c
@@ -397,7 +397,7 @@ int ltdb_filter_attrs(TALLOC_CTX *mem_ctx,
        /* Shortcuts for the simple cases */
        } else if (add_dn && i == 1) {
                if (msg_add_distinguished_name(msg2) != 0) {
-                       return -1;
+                       goto failed;
                }
                *filtered_msg = msg2;
                return 0;
@@ -463,7 +463,7 @@ int ltdb_filter_attrs(TALLOC_CTX *mem_ctx,
 
        if (add_dn) {
                if (msg_add_distinguished_name(msg2) != 0) {
-                       return -1;
+                       goto failed;
                }
        }
 
@@ -472,7 +472,7 @@ int ltdb_filter_attrs(TALLOC_CTX *mem_ctx,
                                                struct ldb_message_element,
                                                msg2->num_elements);
                if (msg2->elements == NULL) {
-                       return -1;
+                       goto failed;
                }
        } else {
                talloc_free(msg2->elements);
@@ -483,6 +483,7 @@ int ltdb_filter_attrs(TALLOC_CTX *mem_ctx,
 
        return 0;
 failed:
+       TALLOC_FREE(msg2);
        return -1;
 }
 

diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c
index 51d608723e8b16f4b620f4bad2c63cd4ce0b6653..daf9a778f5b8e09e0912c8f7f8f67b3228909c6c 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -485,6 +485,7 @@ int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flg
        }
 
        if (ltdb->read_only) {
+               talloc_free(tdb_key_ctx);
                return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
@@ -732,6 +733,7 @@ int ltdb_delete_noindex(struct ldb_module *module,
        }
 
        if (ltdb->read_only) {
+               talloc_free(tdb_key_ctx);
                return LDB_ERR_UNWILLING_TO_PERFORM;
        }