Fix coverity issues in vhost-user code, fixes VPP-189

[vpp.git] / vnet / vnet / devices / virtio / vhost-user.c

diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
index 5902c42..dca60f1 100644 (file)
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/vnet/vnet/devices/virtio/vhost-user.c
@@ -296,6 +296,9 @@ static clib_error_t * vhost_user_socket_read (unix_file_t * uf)
   memset(&mh, 0, sizeof(mh));
   memset(control, 0, sizeof(control));
 
+  for (i=0; i < VHOST_MEMORY_MAX_NREGIONS; i++)
+    fds[i] = -1;
+
   /* set the payload */
   iov[0].iov_base = (void *) &msg;
   iov[0].iov_len = VHOST_USER_MSG_HDR_SZ;
@@ -1144,6 +1147,8 @@ VLIB_REGISTER_NODE (vhost_user_input_node) = {
   },
 };
 
+VLIB_NODE_FUNCTION_MULTIARCH (vhost_user_input_node, vhost_user_input)
+
 static uword
 vhost_user_intfc_tx (vlib_main_t * vm,
                  vlib_node_runtime_t * node,
@@ -1373,6 +1378,9 @@ VNET_DEVICE_CLASS (vhost_user_dev_class,static) = {
   .no_flatten_output_chains = 1,
 };
 
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (vhost_user_dev_class,
+                                  vhost_user_intfc_tx)
+
 static uword
 vhost_user_process (vlib_main_t * vm,
               vlib_node_runtime_t * rt,
@@ -1482,8 +1490,8 @@ int vhost_user_delete_if(vnet_main_t * vnm, vlib_main_t * vm,
 // init server socket on specified sock_filename
 static int vhost_user_init_server_sock(const char * sock_filename, int *sockfd)
 {
-  int rv = 0, len;
-  struct sockaddr_un un;
+  int rv = 0;
+  struct sockaddr_un un = {};
   int fd;
   /* create listening socket */
   fd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -1493,14 +1501,12 @@ static int vhost_user_init_server_sock(const char * sock_filename, int *sockfd)
   }
 
   un.sun_family = AF_UNIX;
-  strcpy((char *) un.sun_path, (char *) sock_filename);
+  strncpy((char *) un.sun_path, (char *) sock_filename, sizeof(un.sun_path) - 1);
 
   /* remove if exists */
   unlink( (char *) sock_filename);
 
-  len = strlen((char *) un.sun_path) + strlen((char *) sock_filename);
-
-  if (bind(fd, (struct sockaddr *) &un, len) == -1) {
+  if (bind(fd, (struct sockaddr *) &un, sizeof(un)) == -1) {
     rv = VNET_API_ERROR_SYSCALL_ERROR_2;
     goto error;
   }
@@ -1643,7 +1649,7 @@ static void vhost_user_vui_register(vlib_main_t * vm, vhost_user_intf_t *vui)
   if (tm->n_vlib_mains == 1)
     vlib_node_set_state (vm, vhost_user_input_node.index,
                          VLIB_NODE_STATE_POLLING);
-  else if (!dm->have_io_threads)
+  else
     vlib_node_set_state (vlib_mains[cpu_index], vhost_user_input_node.index,
                          VLIB_NODE_STATE_POLLING);
 
@@ -1660,18 +1666,10 @@ int vhost_user_create_if(vnet_main_t * vnm, vlib_main_t * vm,
                          u8 *hwaddr)
 {
   vhost_user_intf_t * vui = NULL;
-  dpdk_main_t * dm = &dpdk_main;
-  vlib_thread_main_t * tm = vlib_get_thread_main();
   u32 sw_if_idx = ~0;
   int sockfd = -1;
   int rv = 0;
 
-  if (tm->n_vlib_mains > 1 && dm->have_io_threads)
-    {
-      clib_warning("vhost-user interfaces are not supported with multiple io threads");
-      return -1;
-    }
-
   if (is_server) {
       if ((rv = vhost_user_init_server_sock (sock_filename, &sockfd)) != 0) {
           return rv;
@@ -1781,12 +1779,16 @@ vhost_user_connect_command_fn (vlib_main_t * vm,
 
   vnet_main_t *vnm = vnet_get_main();
 
-  vhost_user_create_if(vnm, vm, (char *)sock_filename,
+  int rv;
+  if ((rv = vhost_user_create_if(vnm, vm, (char *)sock_filename,
                        is_server, &sw_if_index, feature_mask,
-                       renumber, custom_dev_instance, hw);
+                       renumber, custom_dev_instance, hw))) {
+      vec_free(sock_filename);
+      return clib_error_return (0, "vhost_user_create_if returned %d", rv);
+  }
 
   vec_free(sock_filename);
-
+  vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
   return 0;
 }