aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/memif
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2019-07-23 16:28:36 -0400
committerDave Barach <dave@barachs.net>2019-07-23 16:29:10 -0400
commit3940de36728b768574a3e998389bb90d55f690d1 (patch)
treef3c04d65748319ca38cbabce43c918f7ea745f1d /src/plugins/memif
parentb725ebb3f47302c416e41c7be3f5a8bb3c9fe547 (diff)
api: binary api cleanup
Multiple API message handlers call vnet_get_sup_hw_interface(...) without checking the inbound sw_if_index. This can cause a pool_elt_at_index ASSERT in a debug image, and major disorder in a production image. Given that a number of places are coded as follows, add an "api_visible_or_null" variant of vnet_get_sup_hw_interface, which returns NULL given an invalid sw_if_index, or a hidden sw interface: - hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index); if (hw == NULL || memif_device_class.index != hw->dev_class_index) return clib_error_return (0, "not a memif interface"); Rename two existing xxx_safe functions -> xxx_or_null to make it obvious what they return. Type: fix Change-Id: I29996e8d0768fd9e0c5495bd91ff8bedcf2c5697 Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/plugins/memif')
-rw-r--r--src/plugins/memif/cli.c2
-rw-r--r--src/plugins/memif/memif_api.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/memif/cli.c b/src/plugins/memif/cli.c
index dd13adb929b..00c947a594a 100644
--- a/src/plugins/memif/cli.c
+++ b/src/plugins/memif/cli.c
@@ -298,7 +298,7 @@ memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
return clib_error_return (0,
"please specify interface name or sw_if_index");
- hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+ hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index);
if (hw == NULL || memif_device_class.index != hw->dev_class_index)
return clib_error_return (0, "not a memif interface");
diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c
index bbc9e5c7c4a..ebe7a35c820 100644
--- a/src/plugins/memif/memif_api.c
+++ b/src/plugins/memif/memif_api.c
@@ -209,11 +209,14 @@ vl_api_memif_delete_t_handler (vl_api_memif_delete_t * mp)
vlib_main_t *vm = vlib_get_main ();
vnet_main_t *vnm = vnet_get_main ();
vl_api_memif_delete_reply_t *rmp;
- vnet_hw_interface_t *hi =
- vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index));
+ vnet_hw_interface_t *hi;
memif_if_t *mif;
int rv = 0;
+ hi =
+ vnet_get_sup_hw_interface_api_visible_or_null (vnm,
+ ntohl (mp->sw_if_index));
+
if (hi == NULL || memif_device_class.index != hi->dev_class_index)
rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
else