On Tue, Feb 14, 2012 at 08:45:59AM -0500, Stephen Gallagher wrote: > On Tue, 2012-02-14 at 14:34 +0100, Jakub Hrozek wrote: > > https://fedorahosted.org/sssd/ticket/1186 > > Obvious ack. Great catch!
We might want to fix the other places where parentage is kept to state even for array members -- having the parentage link to the array is more talloc-y. Another patch is attached.
From a0aa5d8dc07e3237cf0fd92695b97b30bcf06150 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek <[email protected]> Date: Tue, 14 Feb 2012 12:30:55 +0100 Subject: [PATCH] Fix memory hierarchy when processing nested group memberships https://fedorahosted.org/sssd/ticket/1186 --- src/providers/ldap/sdap_async_initgroups.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index 964f5b0a0f36951a7bf863b8e1f565e3e77407cf..5e0e184ad3d8435dbf7507edbd58d2568c421d39 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -426,10 +426,10 @@ static void sdap_initgr_rfc2307_process(struct tevent_req *subreq) } /* Copy the new groups into the list. - * They're already allocated on 'state'. */ for (i = 0; i < count; i++) { - state->ldap_groups[state->ldap_groups_count + i] = ldap_groups[i]; + state->ldap_groups[state->ldap_groups_count + i] = + talloc_steal(state->ldap_groups, ldap_groups[i]); } state->ldap_groups_count += count; @@ -1553,11 +1553,10 @@ static void sdap_initgr_rfc2307bis_process(struct tevent_req *subreq) } /* Copy the new groups into the list. - * They're already allocated on 'state'. */ for (i = 0; i < count; i++) { state->direct_groups[state->num_direct_parents + i] = - ldap_groups[i]; + talloc_steal(state->direct_groups, ldap_groups[i]); } state->num_direct_parents += count; @@ -2204,10 +2203,13 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq) } /* Copy the new groups into the list. - * They're already allocated on 'state'. + * They're allocated on 'state' so we need to move them + * onto ldap_parents so that the data won't disappear when + * we finish this nesting level. */ for (i = 0; i < count; i++) { - state->ldap_parents[state->parents_count + i] = ldap_groups[i]; + state->ldap_parents[state->parents_count + i] = + talloc_steal(state->ldap_parents, ldap_groups[i]); } state->parents_count += count; -- 1.7.7.6
_______________________________________________ sssd-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/sssd-devel
