From 578c0b134c751196f7ad53a1cb53d3518ef09472 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 16 Feb 2023 09:06:59 -0500 Subject: [PATCH 1/2] zebra: Ensure bvlan is non null Coverity rightly points out that a call into zebra_l2_bridge_if_vlan_find is NULL checked 4/5 times. Let's make it 5/5 Signed-off-by: Donald Sharp --- zebra/zebra_l2_bridge_if.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zebra/zebra_l2_bridge_if.c b/zebra/zebra_l2_bridge_if.c index 6574899927..b85d39bcd6 100644 --- a/zebra/zebra_l2_bridge_if.c +++ b/zebra/zebra_l2_bridge_if.c @@ -209,6 +209,8 @@ static int zebra_l2_bridge_if_vlan_update(struct interface *ifp, zif = (struct zebra_if *)ifp->info; bvlan = zebra_l2_bridge_if_vlan_find(zif, bvl->vid); + if (!bvlan) + return 0; if (chgflags & ZEBRA_BRIDGEIF_ACCESS_BD_CHANGE) bvlan->access_bd = bvl->access_bd; From 88c1f6131a9e0f62931225e4c67881afe096908f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 16 Feb 2023 09:17:20 -0500 Subject: [PATCH 2/2] pimd: Remove impossible situation Coverity complains that MLAG_MSG_NONE cannot be reached in the switch statement. Which is true so let's make it happy. Signed-off-by: Donald Sharp --- pimd/pim_zpthread.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pimd/pim_zpthread.c b/pimd/pim_zpthread.c index e12a5c4374..b797ac184a 100644 --- a/pimd/pim_zpthread.c +++ b/pimd/pim_zpthread.c @@ -38,9 +38,6 @@ static void pim_mlag_zebra_fill_header(enum mlag_msg_type msg_type) uint16_t data_len = 0; uint16_t msg_cnt = 1; - if (msg_type == MLAG_MSG_NONE) - return; - switch (msg_type) { case MLAG_REGISTER: case MLAG_DEREGISTER: @@ -55,6 +52,7 @@ static void pim_mlag_zebra_fill_header(enum mlag_msg_type msg_type) fill_msg_type = MLAG_MROUTE_DEL_BULK; break; case MLAG_MSG_NONE: + return; case MLAG_STATUS_UPDATE: case MLAG_DUMP: case MLAG_MROUTE_ADD_BULK: