From 050fe53bf15ae161edf444bba6575fcb41df654f Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 28 May 2014 18:03:23 +0200 Subject: [PATCH] Fix several talloc stack frames not freed Signed-off-by: Samuel Cabrero --- source3/passdb/pdb_samba_dsdb.c | 8 ++++++++ source3/smbd/posix_acls.c | 1 + source4/torture/libnetapi/libnetapi.c | 1 + 3 files changed, 10 insertions(+) diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c index 0ff2e0a..e81cbec 100644 --- a/source3/passdb/pdb_samba_dsdb.c +++ b/source3/passdb/pdb_samba_dsdb.c @@ -339,6 +339,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state, msg = ldb_msg_new(frame); if (!msg) { + talloc_free(frame); return false; } @@ -375,6 +376,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state, pw, strlen(pw), (void *)&pw_utf16.data, &pw_utf16.length)) { + talloc_free(frame); return LDB_ERR_OPERATIONS_ERROR; } ret |= ldb_msg_add_value(msg, "clearTextPassword", &pw_utf16, NULL); @@ -1010,6 +1012,7 @@ static NTSTATUS pdb_samba_dsdb_getgrgid(struct pdb_methods *m, GROUP_MAP *map, status = idmap_xids_to_sids(state->idmap_ctx, tmp_ctx, id_maps); if (!NT_STATUS_IS_OK(status)) { + talloc_free(tmp_ctx); return status; } status = pdb_samba_dsdb_getgrsid(m, map, *id_map.sid); @@ -1508,6 +1511,7 @@ static NTSTATUS pdb_samba_dsdb_delete_alias(struct pdb_methods *m, if (ldb_transaction_start(state->ldb) != LDB_SUCCESS) { DEBUG(0, ("Failed to start transaction in dsdb_add_domain_alias(): %s\n", ldb_errstring(state->ldb))); + talloc_free(tmp_ctx); return NT_STATUS_INTERNAL_ERROR; } @@ -1529,15 +1533,18 @@ static NTSTATUS pdb_samba_dsdb_delete_alias(struct pdb_methods *m, DEBUG(10, ("ldb_delete failed %s\n", ldb_errstring(state->ldb))); ldb_transaction_cancel(state->ldb); + talloc_free(tmp_ctx); return NT_STATUS_LDAP(rc); } if (ldb_transaction_commit(state->ldb) != LDB_SUCCESS) { DEBUG(0, ("Failed to commit transaction in pdb_samba_dsdb_delete_alias(): %s\n", ldb_errstring(state->ldb))); + talloc_free(tmp_ctx); return NT_STATUS_INTERNAL_ERROR; } + talloc_free(tmp_ctx); return NT_STATUS_OK; } @@ -2044,6 +2051,7 @@ static bool pdb_samba_dsdb_gid_to_sid(struct pdb_methods *m, gid_t gid, status = idmap_xids_to_sids(state->idmap_ctx, tmp_ctx, id_maps); if (!NT_STATUS_IS_OK(status)) { + talloc_free(tmp_ctx); return false; } *sid = *id_map.sid; diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 2685f6a..8e04938 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -4796,6 +4796,7 @@ struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fna conn = talloc_zero(frame, connection_struct); if (conn == NULL) { DEBUG(0, ("talloc failed\n")); + talloc_free(frame); return NULL; } diff --git a/source4/torture/libnetapi/libnetapi.c b/source4/torture/libnetapi/libnetapi.c index c516976..431b531 100644 --- a/source4/torture/libnetapi/libnetapi.c +++ b/source4/torture/libnetapi/libnetapi.c @@ -35,6 +35,7 @@ bool torture_libnetapi_init_context(struct torture_context *tctx, if (!lp_load(lpcfg_configfile(tctx->lp_ctx), true, false, false, true)) { fprintf(stderr, "error loading %s\n", lpcfg_configfile(tctx->lp_ctx)); + talloc_free(frame); return W_ERROR_V(WERR_GENERAL_FAILURE); } -- 1.9.1