From 5338a779c975c12074e9dd7ba10ba49fb7ed4bda Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 23 Sep 2022 09:57:40 +0200
Subject: Fixed possible race condition in hostcache trie matching code not
 triggering HCU

---
 nest/rt-table.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'nest/rt-table.c')

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 051bc949..5db5755f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4445,11 +4445,16 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
   struct hostcache *hc = SKIP_BACK(struct hostcache, req, req);
 
   /* No interest in this update, mark seen only */
-  if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
-  {
-    rpe_mark_seen_all(req->hook, first, NULL);
+  int interested = 1;
+  RT_LOCKED((rtable *) hc->update.data, tab)
+    if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
+    {
+      rpe_mark_seen_all(req->hook, first, NULL);
+      interested = 0;
+    }
+
+  if (!interested)
     return;
-  }
 
   /* This net may affect some hostentries, check the actual change */
   rte *o = RTE_VALID_OR_NULL(first->old_best);
-- 
cgit v1.2.3