From: Benoît Ganne <bganne@cisco.com>
Date: Wed, 16 Oct 2019 13:08:37 +0000 (+0200)
Subject: fib: fix use-after-free for interface adj removal
X-Git-Tag: v20.05-rc0~618
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7391156ce68a81f258d65f498ec6161d694fae47;p=vpp.git

fib: fix use-after-free for interface adj removal

Type: fix

Change-Id: I82308e368d14d84f5970dad229bdcf2de7d1839d
Signed-off-by: Benoît Ganne <bganne@cisco.com>
---

diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index cbd6691f78f..7f053c82d59 100644
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -823,12 +823,15 @@ adj_nbr_interface_delete_one (adj_index_t ai,
     };
     ip_adjacency_t *adj;
 
+    adj_lock(ai);
+
     adj = adj_get(ai);
 
     adj->ia_flags |= ADJ_FLAG_SYNC_WALK_ACTIVE;
     fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx);
     adj->ia_flags &= ~ADJ_FLAG_SYNC_WALK_ACTIVE;
 
+    adj_unlock(ai);
     return (ADJ_WALK_RC_CONTINUE);
 }