From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 4 Jan 2024 14:53:27 +0000 (+0900)
Subject: network/queue: stop processing requests when a new request is queued
X-Git-Tag: v256-rc1~1203^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f6b801b0d69a01971cdb3745b7e9df0e2fe6c6f;p=thirdparty%2Fsystemd.git

network/queue: stop processing requests when a new request is queued

Otherwise, the loop triggers assertion:
```
Assertion 'e->p.b.key == i->next_key' failed at src/basic/hashmap.c:614, function hashmap_iterate_in_insertion_order(). Aborting.
```
---

diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
index 3f3569f44d5..a2edfd0e79c 100644
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.h
@@ -100,6 +100,7 @@ struct Manager {
 
         FirewallContext *fw_ctx;
 
+        bool request_queued;
         OrderedSet *request_queue;
 
         Hashmap *tuntap_fds_by_name;
diff --git a/src/network/networkd-queue.c b/src/network/networkd-queue.c
index 7c626309686..1678510d522 100644
--- a/src/network/networkd-queue.c
+++ b/src/network/networkd-queue.c
@@ -168,6 +168,10 @@ static int request_new(
         if (req->counter)
                 (*req->counter)++;
 
+        /* If this is called in the ORDERED_SET_FOREACH() loop of manager_process_requests(), we need to
+         * exit from the loop, due to the limitation of the iteration on OrderedSet. */
+        manager->request_queued = true;
+
         if (ret)
                 *ret = req;
 
@@ -220,6 +224,8 @@ int manager_process_requests(Manager *manager) {
 
         assert(manager);
 
+        manager->request_queued = false;
+
         ORDERED_SET_FOREACH(req, manager->request_queue) {
                 _cleanup_(link_unrefp) Link *link = link_ref(req->link);
 
@@ -236,8 +242,11 @@ int manager_process_requests(Manager *manager) {
                         return 0;
 
                 r = req->process(req, link, req->userdata);
-                if (r == 0)
-                        continue; /* The request is not ready. */
+                if (r == 0) { /* The request is not ready. */
+                        if (manager->request_queued)
+                                break; /* a new request is queued during processing the request. */
+                        continue;
+                }
 
                 /* If the request sends netlink message, e.g. for Address or so, the Request object is
                  * referenced by the netlink slot, and will be detached later by its destroy callback.
@@ -251,6 +260,9 @@ int manager_process_requests(Manager *manager) {
                          * hence we need to exit from the loop. */
                         break;
                 }
+
+                if (manager->request_queued)
+                        break;
         }
 
         return 0;