s4:rpc_server: make use of dcesrv_assoc_group_common_destructor()

Currently this should not be needed, but it's better to
call dcesrv_assoc_group_common_destructor() in all assoc_group
destructors.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 19657be71d7cec5ac58a5d6969dc1d6ae7c5b517)

Autobuild-User(v4-20-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-20-test): Wed Dec 18 09:51:41 UTC 2024 on atb-devel-224

librpc/rpc/dcesrv_core.h

@@ -647,6 +647,8 @@ _PUBLIC_ NTSTATUS dcesrv_interface_bind_reject_connect(struct dcesrv_connection_
 _PUBLIC_ NTSTATUS dcesrv_interface_bind_allow_connect(struct dcesrv_connection_context *context,
 						      const struct dcesrv_interface *iface);
 
+_PUBLIC_ void dcesrv_assoc_group_common_destructor(struct dcesrv_assoc_group *assoc_group);
+
 _PUBLIC_ NTSTATUS _dcesrv_iface_state_store_assoc(
 		struct dcesrv_call_state *call,
 		uint64_t magic,

librpc/rpc/dcesrv_handles.c

@@ -163,10 +163,25 @@ struct dcesrv_iface_state {
 
 static int dcesrv_iface_state_destructor(struct dcesrv_iface_state *istate)
 {
-	DLIST_REMOVE(istate->assoc->iface_states, istate);
+	if (istate->assoc != NULL) {
+		DLIST_REMOVE(istate->assoc->iface_states, istate);
+		istate->assoc = NULL;
+	}
 	return 0;
 }
 
+void dcesrv_assoc_group_common_destructor(struct dcesrv_assoc_group *assoc_group)
+{
+	struct dcesrv_iface_state *cur = NULL;
+	struct dcesrv_iface_state *next = NULL;
+
+	for (cur = assoc_group->iface_states; cur != NULL; cur = next) {
+		next = cur->next;
+		cur->assoc = NULL;
+		DLIST_REMOVE(assoc_group->iface_states, cur);
+	}
+}
+
 static void *dcesrv_iface_state_find(struct dcesrv_assoc_group *assoc,
 			const struct dcesrv_interface *iface,
 			const struct dom_sid *owner,

source3/rpc_server/rpc_server.c

@@ -138,6 +138,9 @@ void dcesrv_log_successful_authz(
 static int dcesrv_assoc_group_destructor(struct dcesrv_assoc_group *assoc_group)
 {
 	int ret;
+
+	dcesrv_assoc_group_common_destructor(assoc_group);
+
 	ret = idr_remove(assoc_group->dce_ctx->assoc_groups_idr,
 			 assoc_group->id);
 	if (ret != 0) {

source3/rpc_server/rpc_worker.c

@@ -661,6 +661,8 @@ static int rpc_worker_assoc_group_destructor(
 {
 	int ret;
 
+	dcesrv_assoc_group_common_destructor(assoc_group);
+
 	ret = idr_remove(
 		assoc_group->dce_ctx->assoc_groups_idr,
 		assoc_group->id & UINT16_MAX);

source4/rpc_server/dcerpc_server.c

@@ -75,6 +75,9 @@ static struct dcesrv_assoc_group *dcesrv_assoc_group_reference(struct dcesrv_con
 static int dcesrv_assoc_group_destructor(struct dcesrv_assoc_group *assoc_group)
 {
 	int ret;
+
+	dcesrv_assoc_group_common_destructor(assoc_group);
+
 	ret = idr_remove(assoc_group->dce_ctx->assoc_groups_idr, assoc_group->id);
 	if (ret != 0) {
 		DEBUG(0,(__location__ ": Failed to remove assoc_group 0x%08x\n",