From 7784140f2bd2d5ae44f2be1507ac25f102006155 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 29 Apr 2020 17:04:10 -0400 Subject: misc: binary api fuzz test fixes Add a hook to src/vlibapi/api_shared.c to fuzz (screw up) binary API messages, e.g. by xoring random data into them before processing. We specifically exempt client connection messages, and inband debug CLI messages. We step over msg_id, client index, client context, and sw_if_index. Otherwise, "make test" vectors fail too rapidly to learn anything. The goal is to reduce the number of crashes caused to zero. We're fairly close with this patch. Add vl_msg_api_max_length(void *mp), which returns the maximum plausible length for a binary API message. Use it to hardern vl_api_from_api_to_new_vec(...) which takes an additional argument - message pointer - so it can verify that astr->length is sane. If it's not sane, return a u8 *vector of the form "insane astr->length nnnn\0". Verify array lengths in vl_api_dhcp6_send_client_message_t_handler(...) and vl_api_dhcp6_pd_send_client_message_t_handler(...). Add a fairly effective binary API fuzz hook to the unittest plugin, and modify the "make test" framework.py to pass "api-fuzz { on|off }" to enable API fuzzing: "make API_FUZZ=on TEST=xxx test-debug" or similar Type: improvement Signed-off-by: Dave Barach Change-Id: I0157267652a163c01553d5267620f719cc6c3bde --- src/vnet/ip/ip_api.c | 5 +++-- src/vnet/ip/punt_api.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/vnet/ip') diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c index 3bc46fee59b..d5fa2d32f21 100644 --- a/src/vnet/ip/ip_api.c +++ b/src/vnet/ip/ip_api.c @@ -1544,13 +1544,14 @@ static void vl_api_ip_punt_redirect_dump_t_handler (vl_api_ip_punt_redirect_dump_t * mp) { vl_api_registration_t *reg; - fib_protocol_t fproto; + fib_protocol_t fproto = FIB_PROTOCOL_IP4; reg = vl_api_client_index_to_registration (mp->client_index); if (!reg) return; - fproto = mp->is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4; + if (mp->is_ipv6 == 1) + fproto = FIB_PROTOCOL_IP6; ip_punt_redirect_walk_ctx_t ctx = { .reg = reg, diff --git a/src/vnet/ip/punt_api.c b/src/vnet/ip/punt_api.c index 2acf8265dc1..3a964b4b7f5 100644 --- a/src/vnet/ip/punt_api.c +++ b/src/vnet/ip/punt_api.c @@ -372,7 +372,7 @@ vl_api_punt_reason_dump_t_handler (vl_api_punt_reason_dump_t * mp) punt_reason_dump_walk_ctx_t ctx = { .reg = reg, .context = mp->context, - .name = vl_api_from_api_to_new_vec (&mp->reason.name), + .name = vl_api_from_api_to_new_vec (mp, &mp->reason.name), }; punt_reason_walk (punt_reason_dump_walk_cb, &ctx); -- cgit 1.2.3-korg