proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: don't corrupt memory for long hostnames

Browse Source 
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Christian Franke 2015-11-12 14:09:08 +01:00 committed by Donald Sharp
parent ac7d316959
commit e316f9ab5a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
isisd/isis_lsp.c
View File

@ -1222,12 +1222,19 @@ lsp_build (struct isis_lsp *lsp, struct isis_area *area)
/* Dynamic Hostname */ /* Dynamic Hostname */
if (area->dynhostname) if (area->dynhostname)
{ {
const char *hostname = unix_hostname();
size_t hostname_len = strlen(hostname);
lsp->tlv_data.hostname = XMALLOC (MTYPE_ISIS_TLV, lsp->tlv_data.hostname = XMALLOC (MTYPE_ISIS_TLV,
sizeof (struct hostname)); sizeof (struct hostname));
memcpy (lsp->tlv_data.hostname->name, unix_hostname (), strncpy((char *)lsp->tlv_data.hostname->name, hostname,
strlen (unix_hostname ())); sizeof(lsp->tlv_data.hostname->name));
lsp->tlv_data.hostname->namelen = strlen (unix_hostname ()); if (hostname_len <= MAX_TLV_LEN)
lsp->tlv_data.hostname->namelen = hostname_len;
else
lsp->tlv_data.hostname->namelen = MAX_TLV_LEN;
tlv_add_dynamic_hostname (lsp->tlv_data.hostname, lsp->pdu); tlv_add_dynamic_hostname (lsp->tlv_data.hostname, lsp->pdu);
} }

2
isisd/isis_tlv.h
View File

@ -112,6 +112,8 @@
#define AUTH_INFO_HDRLEN 3 #define AUTH_INFO_HDRLEN 3
#define MAX_TLV_LEN 255
#define IS_NEIGHBOURS_LEN (ISIS_SYS_ID_LEN + 5) #define IS_NEIGHBOURS_LEN (ISIS_SYS_ID_LEN + 5)
#define LAN_NEIGHBOURS_LEN 6 #define LAN_NEIGHBOURS_LEN 6
#define LSP_ENTRIES_LEN (10 + ISIS_SYS_ID_LEN) /* FIXME: should be entry */ #define LSP_ENTRIES_LEN (10 + ISIS_SYS_ID_LEN) /* FIXME: should be entry */