diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 4a5d5c3b6e..54593497cc 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -2836,7 +2836,7 @@ static int bgp_evpn_route_rmac_self_check(struct bgp *bgp_vrf,
 			char buf1[PREFIX_STRLEN];
 			char attr_str[BUFSIZ] = {0};
 
-			bgp_dump_attr(pi->attr, attr_str, BUFSIZ);
+			bgp_dump_attr(pi->attr, attr_str, sizeof(attr_str));
 
 			zlog_debug("%s: bgp %u prefix %s with attr %s - DENIED due to self mac",
 				__func__, bgp_vrf->vrf_id,
@@ -5190,7 +5190,8 @@ int bgp_filter_evpn_routes_upon_martian_nh_change(struct bgp *bgp)
 						char attr_str[BUFSIZ] = {0};
 
 						bgp_dump_attr(pi->attr,
-							      attr_str, BUFSIZ);
+							      attr_str,
+							      sizeof(attr_str));
 
 						zlog_debug(
 							"%u: prefix %pRN with attr %s - DENIED due to martian or self nexthop",
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 9deba330b8..701b9f446f 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1573,7 +1573,8 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size)
 	if (attr_parse_ret == BGP_ATTR_PARSE_WITHDRAW
 	    || BGP_DEBUG(update, UPDATE_IN)
 	    || BGP_DEBUG(update, UPDATE_PREFIX)) {
-		ret = bgp_dump_attr(&attr, peer->rcvd_attr_str, BUFSIZ);
+		ret = bgp_dump_attr(&attr, peer->rcvd_attr_str,
+				    sizeof(peer->rcvd_attr_str));
 
 		peer->stat_upd_7606++;
 
diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index 5df9e3f23f..f706b834fe 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -837,7 +837,7 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp)
 				memset(send_attr_str, 0, BUFSIZ);
 				send_attr_printed = 0;
 				bgp_dump_attr(adv->baa->attr, send_attr_str,
-					      BUFSIZ);
+					      sizeof(send_attr_str));
 			}
 		}
 
@@ -1147,7 +1147,7 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
 
 		attrstr[0] = '\0';
 
-		bgp_dump_attr(attr, attrstr, BUFSIZ);
+		bgp_dump_attr(attr, attrstr, sizeof(attrstr));
 
 		if (addpath_encode)
 			snprintf(tx_id_buf, sizeof(tx_id_buf),