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

lib: Convert assert to error and record it instead of aborting

Browse Source 
When we get a bad value for the opaque data length, instead
of stopping the program, discard the data and move on.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-08-04 11:13:26 -04:00
parent 22e135b451
commit 1ae0e1b315
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/zclient.c
View File

@ -1299,7 +1299,13 @@ int zapi_route_encode(uint8_t cmd, struct stream *s, struct zapi_route *api)
stream_putl(s, api->tableid); stream_putl(s, api->tableid);
if (CHECK_FLAG(api->message, ZAPI_MESSAGE_OPAQUE)) { if (CHECK_FLAG(api->message, ZAPI_MESSAGE_OPAQUE)) {
assert(api->opaque.length <= ZAPI_MESSAGE_OPAQUE_LENGTH); if (api->opaque.length > ZAPI_MESSAGE_OPAQUE_LENGTH) {
flog_err(
EC_LIB_ZAPI_ENCODE,
"%s: opaque length %u is greater than allowed value",
__func__, api->opaque.length);
return -1;
}
stream_putw(s, api->opaque.length); stream_putw(s, api->opaque.length);
stream_write(s, api->opaque.data, api->opaque.length); stream_write(s, api->opaque.data, api->opaque.length);
@ -1537,7 +1543,13 @@ int zapi_route_decode(struct stream *s, struct zapi_route *api)
if (CHECK_FLAG(api->message, ZAPI_MESSAGE_OPAQUE)) { if (CHECK_FLAG(api->message, ZAPI_MESSAGE_OPAQUE)) {
STREAM_GETW(s, api->opaque.length); STREAM_GETW(s, api->opaque.length);
assert(api->opaque.length <= ZAPI_MESSAGE_OPAQUE_LENGTH); if (api->opaque.length > ZAPI_MESSAGE_OPAQUE_LENGTH) {
flog_err(
EC_LIB_ZAPI_ENCODE,
"%s: opaque length %u is greater than allowed value",
__func__, api->opaque.length);
return -1;
}
STREAM_GET(api->opaque.data, s, api->opaque.length); STREAM_GET(api->opaque.data, s, api->opaque.length);
} }