diff options
| author |   Steven <sluong@cisco.com> | 2018-04-17 08:50:28 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-04-17 18:30:25 +0000 |
| commit | 332e0440a51ccc71356cd82b0908dee5f46ba155 (patch) | |
| tree | 2eef7b9c6e93a58ccb155c28310866533705d21d | |
| parent | 88c50b7d4b6061d4029426c07aedd62a1dd0e3f4 (diff) | |
vhost: show vhost-user <interface> may crash [VPP-1242]
show vhost-user <interface> may cause a crash if interface is semi-bogus.
Semi-bogus means it is a known vpp interface which has a hw_if_index, but
it is bogus because it is not a vhost-user interface.
The fix is to add a check to reject non vhost-user interface for the
command.
Change-Id: I63f1e8bfbf46f5ec4c30f9fb3546982b63cd7cc5
Signed-off-by: Steven <sluong@cisco.com>
(cherry picked from commit 583f158b44d9644855441280e09afbf85a4557df)
| -rw-r--r-- | src/vnet/devices/virtio/vhost-user.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c index 5460f10b74e..c1fca441fa5 100644 --- a/src/vnet/devices/virtio/vhost-user.c +++ b/src/vnet/devices/virtio/vhost-user.c @@ -3253,6 +3253,13 @@ show_vhost_user_command_fn (vlib_main_t * vm, if (unformat (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index)) { + hi = vnet_get_hw_interface (vnm, hw_if_index); + if (vhost_user_dev_class.index != hi->dev_class_index) + { + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); + goto done; + } vec_add1 (hw_if_indices, hw_if_index); } else if (unformat (input, "descriptors") || unformat (input, "desc")) |