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

api: fix non-null-terminated C-string

Browse Source 
Type: fix

Change-Id: I132112bf77e1fad7fc0227a96e6b0cee590295e8
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit fb0bb3a732)
This commit is contained in:
Benoît Ganne
2019-09-27 18:07:39 +02:00
committed by Andrew Yourtchenko
parent c1ee34f8d1
commit 291cd93ee0
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vpp/api/api.c
View File

@ -481,7 +481,11 @@ show_log_details (vl_api_registration_t * reg, u32 context,
u32 msg_size;
vl_api_log_details_t *rmp;
msg_size = sizeof (*rmp) + vec_len (msg_class) + vec_len (message);
int class_len =
clib_min (vec_len (msg_class) + 1, ARRAY_LEN (rmp->msg_class));
int message_len =
clib_min (vec_len (message) + 1, ARRAY_LEN (rmp->message));
msg_size = sizeof (*rmp) + class_len + message_len;
rmp = vl_msg_api_alloc (msg_size);
clib_memset (rmp, 0, msg_size);
@ -491,10 +495,11 @@ show_log_details (vl_api_registration_t * reg, u32 context,
rmp->timestamp = clib_host_to_net_f64 (timestamp);
rmp->level = htonl (*level);
strncpy ((char *) rmp->msg_class, (char *) msg_class,
ARRAY_LEN (rmp->msg_class) - 1);
strncpy ((char *) rmp->message, (char *) message,
ARRAY_LEN (rmp->message) - 1);
memcpy (rmp->msg_class, msg_class, class_len - 1);
memcpy (rmp->message, message, message_len - 1);
/* enforced by memset() above */
ASSERT (0 == rmp->msg_class[class_len - 1]);
ASSERT (0 == rmp->message[message_len - 1]);
vl_api_send_msg (reg, (u8 *) rmp);
}