ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

map: fix non-null-terminated C-string

Browse Source 
Type: fix

Change-Id: Ia3a4693acd5eab234f60b37436c5b642b00bda46
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 3c7c613cf18f7825e22190be45ea7f054efafb77)
This commit is contained in:
Benoît Ganne
2019-09-11 17:47:56 +02:00
committed by Andrew Yourtchenko
parent 8e35619169
commit b7a6c5633c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/map/map_api.c
View File

@ -120,9 +120,10 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
({ ({
map_domain_index = d - mm->domains; map_domain_index = d - mm->domains;
de = vec_elt_at_index(mm->domain_extras, map_domain_index); de = vec_elt_at_index(mm->domain_extras, map_domain_index);
int tag_len = clib_min(ARRAY_LEN(rmp->tag), vec_len(de->tag) + 1);
/* Make sure every field is initiated (or don't skip the clib_memset()) */ /* Make sure every field is initiated (or don't skip the clib_memset()) */
rmp = vl_msg_api_alloc (sizeof (*rmp) + vec_len(de->tag)); rmp = vl_msg_api_alloc (sizeof (*rmp) + tag_len);
rmp->_vl_msg_id = htons(VL_API_MAP_DOMAIN_DETAILS + mm->msg_id_base); rmp->_vl_msg_id = htons(VL_API_MAP_DOMAIN_DETAILS + mm->msg_id_base);
rmp->context = mp->context; rmp->context = mp->context;
@ -138,8 +139,8 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
rmp->psid_length = d->psid_length; rmp->psid_length = d->psid_length;
rmp->flags = d->flags; rmp->flags = d->flags;
rmp->mtu = htons(d->mtu); rmp->mtu = htons(d->mtu);
memcpy(rmp->tag, de->tag, tag_len-1);
strncpy ((char *) rmp->tag, (char *) de->tag, ARRAY_LEN(rmp->tag)-1); rmp->tag[tag_len-1] = '\0';
vl_api_send_msg (reg, (u8 *) rmp); vl_api_send_msg (reg, (u8 *) rmp);
})); }));