proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 22:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13344 from opensourcerouting/fix/backport_8cb4892c0669d916557d693b878420faec8e6e2a

Browse Source 
bgpd: [8.5] Fix lcom->str string length to correctly cover aliases
This commit is contained in:
Donald Sharp 2023-04-21 07:10:36 -04:00 committed by GitHub
commit 4d83e3b1b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_lcommunity.c
View File

@ -211,12 +211,13 @@ static void set_lcommunity_string(struct lcommunity *lcom, bool make_json,
} }
/* 1 space + lcom->size lcom strings + null terminator */ /* 1 space + lcom->size lcom strings + null terminator */
size_t str_buf_sz = BUFSIZ; size_t str_buf_sz = (LCOMMUNITY_STRLEN * lcom->size) + 2;
str_buf = XCALLOC(MTYPE_LCOMMUNITY_STR, str_buf_sz); str_buf = XCALLOC(MTYPE_LCOMMUNITY_STR, str_buf_sz);
len = 0;
for (i = 0; i < lcom->size; i++) { for (i = 0; i < lcom->size; i++) {
if (i > 0) if (i > 0)
strlcat(str_buf, " ", str_buf_sz); len = strlcat(str_buf, " ", str_buf_sz);
pnt = lcom->val + (i * LCOMMUNITY_SIZE); pnt = lcom->val + (i * LCOMMUNITY_SIZE);
pnt = ptr_get_be32(pnt, &global); pnt = ptr_get_be32(pnt, &global);
@ -229,11 +230,22 @@ static void set_lcommunity_string(struct lcommunity *lcom, bool make_json,
snprintf(lcsb, sizeof(lcsb), "%u:%u:%u", global, local1, snprintf(lcsb, sizeof(lcsb), "%u:%u:%u", global, local1,
local2); local2);
/*
* Aliases can cause havoc, if the alias length is greater
* than the LCOMMUNITY_STRLEN for a particular item
* then we need to realloc the memory associated
* with the string so that it can fit
*/
const char *com2alias = const char *com2alias =
translate_alias ? bgp_community2alias(lcsb) : lcsb; translate_alias ? bgp_community2alias(lcsb) : lcsb;
size_t individual_len = strlen(com2alias);
if (individual_len + len > str_buf_sz) {
str_buf_sz = individual_len + len + 1;
str_buf = XREALLOC(MTYPE_LCOMMUNITY_STR, str_buf,
str_buf_sz);
}
len = strlcat(str_buf, com2alias, str_buf_sz); len = strlcat(str_buf, com2alias, str_buf_sz);
assert((unsigned int)len < str_buf_sz);
if (make_json) { if (make_json) {
json_string = json_object_new_string(com2alias); json_string = json_object_new_string(com2alias);