3543. [bug] Update socket stucture before attaching to socket

                        manager after accert. [RT #33084]
(cherry picked from commit a8572209bc671e7b36309c50d732dbad08fa8b53)

diff --git a/CHANGES b/CHANGES
index 87623bf3c5ad7786469b7815a4b9e105a230f9f7..8cb78a2ee26e9ce4685f248cf7e25c3c649abd13 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
+3543.  [bug]           Update socket stucture before attaching to socket
+                       manager after accert. [RT #33084]
+
 3542.  [bug]           masterformat system test was broken. [RT #33086]
 
+3541.  [bug]           The parts if libdns was not being properly initialized
+                       in when built in libexport mode. [RT #33028]
+
 3540.  [bug]           libt_api: t_info and t_assert were not thread safe.
 
        --- 9.6-ESV-R9rc1 released ---

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index cba5d0554191af9978e001fe9a74358788597bd8..0e3e9cb4296d567d7d24abe587535d64cd9ec7f3 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -2997,14 +2997,6 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
        if (fd != -1) {
                int lockid = FDLOCK_ID(fd);
 
-               LOCK(&manager->fdlock[lockid]);
-               manager->fds[fd] = dev->newsocket;
-               manager->fdstate[fd] = MANAGED;
-               UNLOCK(&manager->fdlock[lockid]);
-
-               LOCK(&manager->lock);
-               ISC_LIST_APPEND(manager->socklist, dev->newsocket, link);
-
                dev->newsocket->fd = fd;
                dev->newsocket->bound = 1;
                dev->newsocket->connected = 1;
@@ -3019,6 +3011,13 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
                 */
                dev->address = dev->newsocket->peer_address;
 
+               LOCK(&manager->fdlock[lockid]);
+               manager->fds[fd] = dev->newsocket;
+               manager->fdstate[fd] = MANAGED;
+               UNLOCK(&manager->fdlock[lockid]);
+
+               LOCK(&manager->lock);
+
 #ifdef USE_SELECT
                if (manager->maxfd < fd)
                        manager->maxfd = fd;
@@ -3029,6 +3028,8 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
                           "accepted connection, new socket %p",
                           dev->newsocket);
 
+               ISC_LIST_APPEND(manager->socklist, dev->newsocket, link);
+
                UNLOCK(&manager->lock);
 
                inc_stats(manager->stats, sock->statsindex[STATID_ACCEPT]);