The Samba-Bugzilla – Attachment 15187 Details for
Bug 13956
idmap_tdb2 stops working after some time
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am fix for master.
0001-s3-winbind-Fix-crash-when-invoking-winbind-idmap-scr.patch (text/plain), 4.14 KB, created by
Jeremy Allison
on 2019-05-23 20:35:53 UTC
(
hide
)
Description:
git-am fix for master.
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2019-05-23 20:35:53 UTC
Size:
4.14 KB
patch
obsolete
>From 97608200f55931d0653f97ad11aad5b830035325 Mon Sep 17 00:00:00 2001 >From: Jeremy Allison <jra@samba.org> >Date: Thu, 23 May 2019 13:33:21 -0700 >Subject: [PATCH] s3: winbind: Fix crash when invoking winbind idmap scripts. > >Previously the private context was caching a pointer to >a string returned from lp_XXX(). This string can change >on config file reload. Ensure the string is talloc_strup'ed >onto the owning context instead. > >Reported by Heinrich Mislik <Heinrich.Mislik@univie.ac.at> > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=13956 > >Signed-off-by: Jeremy Allison <jra@samba.org> >--- > source3/winbindd/idmap_script.c | 20 ++++++++++++++++---- > source3/winbindd/idmap_tdb2.c | 22 +++++++++++++++++----- > 2 files changed, 33 insertions(+), 9 deletions(-) > >diff --git a/source3/winbindd/idmap_script.c b/source3/winbindd/idmap_script.c >index e4de1a09ba0..9eed1df2888 100644 >--- a/source3/winbindd/idmap_script.c >+++ b/source3/winbindd/idmap_script.c >@@ -584,6 +584,7 @@ static NTSTATUS idmap_script_db_init(struct idmap_domain *dom) > NTSTATUS ret; > struct idmap_script_context *ctx; > const char * idmap_script = NULL; >+ const char *ctx_script = NULL; > > DEBUG(10, ("%s called ...\n", __func__)); > >@@ -594,7 +595,7 @@ static NTSTATUS idmap_script_db_init(struct idmap_domain *dom) > goto failed; > } > >- ctx->script = idmap_config_const_string(dom->name, "script", NULL); >+ ctx_script = idmap_config_const_string(dom->name, "script", NULL); > > /* Do we even need to handle this? */ > idmap_script = lp_parm_const_string(-1, "idmap", "script", NULL); >@@ -603,13 +604,24 @@ static NTSTATUS idmap_script_db_init(struct idmap_domain *dom) > " Please use 'idmap config * : script' instead!\n")); > } > >- if (strequal(dom->name, "*") && ctx->script == NULL) { >+ if (strequal(dom->name, "*") && ctx_script == NULL) { > /* fall back to idmap:script for backwards compatibility */ >- ctx->script = idmap_script; >+ ctx_script = idmap_script; > } > >- if (ctx->script) { >+ if (ctx_script) { > DEBUG(1, ("using idmap script '%s'\n", ctx->script)); >+ /* >+ * We must ensure this memory is owned by ctx. >+ * The ctx_script const pointer is a pointer into >+ * the config file data and may become invalid >+ * on config file reload. BUG: 13956 >+ */ >+ ctx->script = talloc_strdup(ctx, ctx_script); >+ if (ctx->script == NULL) { >+ ret = NT_STATUS_NO_MEMORY; >+ goto failed; >+ } > } > > dom->private_data = ctx; >diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c >index b784546bb33..eceab9c0784 100644 >--- a/source3/winbindd/idmap_tdb2.c >+++ b/source3/winbindd/idmap_tdb2.c >@@ -522,6 +522,7 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom) > struct idmap_tdb_common_context *commonctx; > struct idmap_tdb2_context *ctx; > const char * idmap_script = NULL; >+ const char *ctx_script = NULL; > > commonctx = talloc_zero(dom, struct idmap_tdb_common_context); > if(!commonctx) { >@@ -543,7 +544,7 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom) > goto failed; > } > >- ctx->script = idmap_config_const_string(dom->name, "script", NULL); >+ ctx_script = idmap_config_const_string(dom->name, "script", NULL); > > idmap_script = lp_parm_const_string(-1, "idmap", "script", NULL); > if (idmap_script != NULL) { >@@ -551,13 +552,24 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom) > " Please use 'idmap config * : script' instead!\n")); > } > >- if (strequal(dom->name, "*") && ctx->script == NULL) { >+ if (strequal(dom->name, "*") && ctx_script == NULL) { > /* fall back to idmap:script for backwards compatibility */ >- ctx->script = idmap_script; >+ ctx_script = idmap_script; > } > >- if (ctx->script) { >- DEBUG(1, ("using idmap script '%s'\n", ctx->script)); >+ if (ctx_script) { >+ DEBUG(1, ("using idmap script '%s'\n", ctx_script)); >+ /* >+ * We must ensure this memory is owned by ctx. >+ * The ctx_script const pointer is a pointer into >+ * the config file data and may become invalid >+ * on config file reload. BUG: 13956 >+ */ >+ ctx->script = talloc_strdup(ctx, ctx_script); >+ if (ctx->script == NULL) { >+ ret = NT_STATUS_NO_MEMORY; >+ goto failed; >+ } > } > > commonctx->max_id = dom->high_id; >-- >2.22.0.rc1.257.g3120a18244-goog >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=15187">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 13956
:
15179
|
15187
|
15196