]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: Fix crash on macvlan link down/up 15010/head
authorTomi Salminen <tlsalmin@gmail.com>
Wed, 13 Dec 2023 09:37:21 +0000 (11:37 +0200)
committerTomi Salminen <tlsalmin@gmail.com>
Wed, 13 Dec 2023 09:49:21 +0000 (11:49 +0200)
Whenever a link up change was detected on a macvlan device where
the linked device wasn't visible in the namespace zebra was
running in, the linked zebra interface was NULL. This was already
handled in the event of a link down, but was ommitted from the
upside. Added the same null check to the up-side.

Signed-off-by: Tomi Salminen <tlsalmin@gmail.com>
zebra/zebra_vxlan.c

index 91a5bc4d425296019471e503da2405ff602d5ec2..931661db763df78831cd2db8702c4e7cd25e952b 100644 (file)
@@ -5159,6 +5159,15 @@ void zebra_vxlan_macvlan_up(struct interface *ifp)
        zif = ifp->info;
        assert(zif);
        link_ifp = zif->link;
+       if (!link_ifp) {
+               if (IS_ZEBRA_DEBUG_VXLAN)
+                       zlog_debug(
+                               "macvlan parent link is not found. Parent index %d ifp %s",
+                               zif->link_ifindex,
+                               ifindex2ifname(zif->link_ifindex,
+                                              ifp->vrf->vrf_id));
+               return;
+       }
        link_zif = link_ifp->info;
        assert(link_zif);