diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2025-03-07 11:22:03 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2025-03-07 11:48:05 -0500 |
| commit | 45e2f0fc6e1571cffdfc106faccafed76c1aac5e (patch) | |
| tree | 0aa0217af8fb29c172d872e9216cf28c954cdb2d /zebra | |
| parent | b221fd5f6c556f52124f1247138c6de4ca8db447 (diff) | |
zebra: malloc functions cannot fail
Let's try to remember that when using a malloc function
it can never fail and as such testing for NULL does
nothing.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/interface.c | 11 | ||||
| -rw-r--r-- | zebra/zebra_vxlan_if.c | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index b7a790382d..8080ba01de 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1728,7 +1728,7 @@ interface_bridge_vxlan_vlan_vni_map_update(struct zebra_dplane_ctx *ctx, dplane_ctx_get_ifp_vxlan_vni_array(ctx); struct zebra_vxlan_vni vni_start, vni_end; struct hash *vni_table = NULL; - struct zebra_vxlan_vni vni, *vnip; + struct zebra_vxlan_vni vni; vni_t vni_id; vlanid_t vid; int i; @@ -1762,11 +1762,8 @@ interface_bridge_vxlan_vlan_vni_map_update(struct zebra_dplane_ctx *ctx, vni_start.vni, vni_end.vni, ifp->name, ifp->ifindex); - if (!vni_table) { + if (!vni_table) vni_table = zebra_vxlan_vni_table_create(); - if (!vni_table) - return; - } for (vid = vni_start.access_vlan, vni_id = vni_start.vni; vid <= vni_end.access_vlan; vid++, vni_id++) { @@ -1774,9 +1771,7 @@ interface_bridge_vxlan_vlan_vni_map_update(struct zebra_dplane_ctx *ctx, memset(&vni, 0, sizeof(vni)); vni.vni = vni_id; vni.access_vlan = vid; - vnip = hash_get(vni_table, &vni, zebra_vxlan_vni_alloc); - if (!vnip) - return; + (void)hash_get(vni_table, &vni, zebra_vxlan_vni_alloc); } memset(&vni_start, 0, sizeof(vni_start)); diff --git a/zebra/zebra_vxlan_if.c b/zebra/zebra_vxlan_if.c index ea0be2f644..fe90b73113 100644 --- a/zebra/zebra_vxlan_if.c +++ b/zebra/zebra_vxlan_if.c @@ -659,8 +659,6 @@ int zebra_vxlan_if_vni_table_create(struct zebra_if *zif) vni_info = VNI_INFO_FROM_ZEBRA_IF(zif); vni_info->vni_table = zebra_vxlan_vni_table_create(); - if (!vni_info->vni_table) - return -ENOMEM; return 0; } |