Revert "bgpd: fix insecure data write with ip addresses"

This reverts commit 54222f921305edbce74e81996e9303c0c6b03823.

diff --git a/bgpd/bgp_linkstate_tlv.c b/bgpd/bgp_linkstate_tlv.c
index 48a570398e866fb4a6a079403e3bffd7d8e792f0..97a024d7cd4fe639d232b70c61d37454b468d0d2 100644 (file)
--- a/bgpd/bgp_linkstate_tlv.c
+++ b/bgpd/bgp_linkstate_tlv.c
@@ -577,8 +577,7 @@ static bool bgp_linkstate_nlri_value_display(char *buf, size_t size,
                break;
        case BGP_LS_TLV_IP_REACHABILITY_INFORMATION:
                mask_length = pnt_decode8(&pnt);
-               if (nlri_type == BGP_LINKSTATE_PREFIX4 &&
-                   ((length - sizeof(mask_length)) <= sizeof(ipv4.s_addr))) {
+               if (nlri_type == BGP_LINKSTATE_PREFIX4) {
                        memcpy(&ipv4.s_addr, pnt, length - sizeof(mask_length));
                        if (json)
                                json_object_string_addf(json, "ipReachability",
@@ -588,8 +587,7 @@ static bool bgp_linkstate_nlri_value_display(char *buf, size_t size,
                                snprintfrr(buf, size, "%sIPv4:%pI4/%u",
                                           first ? "" : " ", &ipv4,
                                           mask_length);
-               } else if (nlri_type == BGP_LINKSTATE_PREFIX6 &&
-                          ((length - sizeof(mask_length)) <= sizeof(ipv6))) {
+               } else if (nlri_type == BGP_LINKSTATE_PREFIX6) {
                        memcpy(&ipv6, pnt, length - sizeof(mask_length));
                        if (json)
                                json_object_string_addf(json, "ipReachability",