zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / bgpd / bgp_encap_tlv.c

diff --git a/bgpd/bgp_encap_tlv.c b/bgpd/bgp_encap_tlv.c
index 4457501613a1b25dde212471c3293a35cebac5bb..30a08098e87d75a7b2fd366728ca45dd435b41d7 100644 (file)
--- a/bgpd/bgp_encap_tlv.c
+++ b/bgpd/bgp_encap_tlv.c
@@ -47,7 +47,7 @@ static struct bgp_attr_encap_subtlv *subtlv_encode_encap_l2tpv3_over_ip(
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_ENCAPSULATION;
        new->length = total;
@@ -72,7 +72,7 @@ subtlv_encode_encap_gre(struct bgp_tea_subtlv_encap_gre_key *st)
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_ENCAPSULATION;
        new->length = total;
@@ -95,7 +95,7 @@ subtlv_encode_encap_pbb(struct bgp_tea_subtlv_encap_pbb *st)
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_ENCAPSULATION;
        new->length = total;
@@ -128,7 +128,7 @@ subtlv_encode_proto_type(struct bgp_tea_subtlv_proto_type *st)
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_PROTO_TYPE;
        new->length = total;
@@ -150,7 +150,7 @@ subtlv_encode_color(struct bgp_tea_subtlv_color *st)
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_COLOR;
        new->length = total;
@@ -182,7 +182,7 @@ subtlv_encode_ipsec_ta(struct bgp_tea_subtlv_ipsec_ta *st)
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_IPSEC_TA;
        new->length = total;
@@ -206,7 +206,7 @@ subtlv_encode_remote_endpoint(struct bgp_tea_subtlv_remote_endpoint *st)
        assert(total <= 0xff);
 
        new = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + total);
+                     sizeof(struct bgp_attr_encap_subtlv) + total);
        assert(new);
        new->type = BGP_ENCAP_SUBTLV_TYPE_REMOTE_ENDPOINT;
        new->length = total;
@@ -404,7 +404,7 @@ void bgp_encap_type_vxlan_to_tlv(
        if (attr->encap_subtlvs)
                XFREE(MTYPE_ENCAP_TLV, attr->encap_subtlvs);
        tlv = XCALLOC(MTYPE_ENCAP_TLV,
-                     sizeof(struct bgp_attr_encap_subtlv) - 1 + 12);
+                     sizeof(struct bgp_attr_encap_subtlv) + 12);
        tlv->type = 1; /* encapsulation type */
        tlv->length = 12;
        if (bet->vnid) {