From 9298a7ec0c23ea95bd8ff6e91fc74e6ecbd53785 Mon Sep 17 00:00:00 2001 From: Joshua Roys Date: Tue, 12 Oct 2021 09:25:47 -0400 Subject: nat: fix static mapping segv Adding a nat44 static mapping during startup on a DHCP interface leads to a segv via this path: - dhcp_client_acquire_address - ip4_add_del_interface_address - ip4_add_del_interface_address_internal - nat44_ed_add_del_interface_address_cb - nat44_ed_add_static_mapping - ip4_interface_first_address Type: fix Signed-off-by: Joshua Roys Change-Id: I38dac8a096b052550f2b87b4e13a950d2cd868b0 (cherry picked from commit f9074fc51544d1849a2df06713c1ccf6cb2eb908) --- src/plugins/nat/nat44-ed/nat44_ed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/nat/nat44-ed/nat44_ed.c b/src/plugins/nat/nat44-ed/nat44_ed.c index a11043682b9..e949df20b45 100644 --- a/src/plugins/nat/nat44-ed/nat44_ed.c +++ b/src/plugins/nat/nat44-ed/nat44_ed.c @@ -3342,7 +3342,7 @@ nat44_ed_add_del_interface_address_cb (ip4_main_t *im, uword opaque, { rv = nat44_ed_add_static_mapping ( rp->l_addr, address[0], rp->l_port, rp->e_port, rp->proto, - rp->vrf_id, ~0, rp->flags, rp->pool_addr, rp->tag); + rp->vrf_id, sw_if_index, rp->flags, rp->pool_addr, rp->tag); if (rv) { nat_elog_notice_X1 (sm, "add_static_mapping returned %d", -- cgit 1.2.3-korg