diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2019-09-11 17:47:56 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-09-30 15:23:59 +0000 |
| commit | b7a6c5633cd3042dbdaf3decfa927d97fef90cb4 (patch) | |
| tree | 894aebf7e88b5baa6720d1c8dd869675a2815c23 /src/plugins/map | |
| parent | 8e356191694e08463e3acaed1c39277c983d845e (diff) | |
map: fix non-null-terminated C-string
Type: fix
Change-Id: Ia3a4693acd5eab234f60b37436c5b642b00bda46
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 3c7c613cf18f7825e22190be45ea7f054efafb77)
Diffstat (limited to 'src/plugins/map')
| -rw-r--r-- | src/plugins/map/map_api.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c index aa624cb1ea3..b73f14aed81 100644 --- a/src/plugins/map/map_api.c +++ b/src/plugins/map/map_api.c @@ -120,9 +120,10 @@ vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp) ({ map_domain_index = d - mm->domains; 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()) */ - 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->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->flags = d->flags; rmp->mtu = htons(d->mtu); - - strncpy ((char *) rmp->tag, (char *) de->tag, ARRAY_LEN(rmp->tag)-1); + memcpy(rmp->tag, de->tag, tag_len-1); + rmp->tag[tag_len-1] = '\0'; vl_api_send_msg (reg, (u8 *) rmp); })); |