From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Tue, 11 Mar 2025 16:10:18 +0000 (+0100)
Subject: fixup! fixup: rt-attr.c: (hopefully) solved deadlock in rehash.  The solution for... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5904567f2f6a4bd1e63e5d45e36f92d9b037420;p=thirdparty%2Fbird.git

fixup! fixup: rt-attr.c: (hopefully) solved deadlock in rehash.  The solution for rehash broke ea_storage_free logic, but now both look repaired.
---

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index a6a97f2d8..4a44fe082 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1873,7 +1873,7 @@ ea_storage_free(struct ea_storage *r)
 
     rcu_read_unlock();
 
-    if ((cur_success || next_success) && !next_to_free)
+    if ((cur_success || next_success) && r != next_to_free)
     {
       /* Consider if rehash is needed */
       int count = atomic_fetch_sub_explicit(&rta_hash_table.count, 1, memory_order_relaxed);