From d06800dd8efb5fabc7d9ea641225b9aa96ff9b2e Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 27 Jul 2023 10:32:25 +0000 Subject: [PATCH] dhcpd: move isc_event_free() before isc_timer_destroy() in timer cb isc_timerevent_destroy() called by isc_event_free() expects to be able to hold the timer lock, so must run before the timer is destroyed. PR misc/57491. --- external/mpl/dhcp/dist/common/dispatch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/external/mpl/dhcp/dist/common/dispatch.c b/external/mpl/dhcp/dist/common/dispatch.c index 6b69da3a32a7..2f96eebf9f98 100644 --- a/external/mpl/dhcp/dist/common/dispatch.c +++ b/external/mpl/dhcp/dist/common/dispatch.c @@ -1,4 +1,4 @@ -/* $NetBSD: dispatch.c,v 1.4 2023/06/27 09:10:25 martin Exp $ */ +/* $NetBSD: dispatch.c,v 1.5 2023/07/27 10:32:25 tnn Exp $ */ /* dispatch.c @@ -29,7 +29,7 @@ */ #include -__RCSID("$NetBSD: dispatch.c,v 1.4 2023/06/27 09:10:25 martin Exp $"); +__RCSID("$NetBSD: dispatch.c,v 1.5 2023/07/27 10:32:25 tnn Exp $"); #include "dhcpd.h" @@ -183,6 +183,7 @@ isclib_timer_callback(isc_task_t *taskp, (*q->unref) (&q->what, MDL); } q->next = free_timeouts; + isc_event_free(&eventp); isc_timer_destroy(&q->isc_timeout); free_timeouts = q; } else { @@ -192,9 +193,9 @@ isclib_timer_callback(isc_task_t *taskp, * don't try to - may change this to a log_fatal */ log_error("Error finding timer structure"); + isc_event_free(&eventp); } - isc_event_free(&eventp); return; }