VCL/LDPRELOAD: Fix out-of-bounds access and inequality comparison coverity errors

[vpp.git] / src / vcl / vcom_socket.c

diff --git a/src/vcl/vcom_socket.c b/src/vcl/vcom_socket.c
index 6fcc4e5..a84359e 100644 (file)
--- a/src/vcl/vcom_socket.c
+++ b/src/vcl/vcom_socket.c
@@ -1413,6 +1413,47 @@ vcom_session_getpeername (int sid, vppcom_endpt_t * ep)
   return rv;
 }
 
+static inline int
+vcom_socket_copy_ep_to_sockaddr (__SOCKADDR_ARG __addr,
+                                socklen_t * __restrict __len,
+                                vppcom_endpt_t * ep)
+{
+  int rv = 0;
+  int sa_len, copy_len;
+
+  __addr->sa_family = (ep->is_ip4 == VPPCOM_IS_IP4) ? AF_INET : AF_INET6;
+  switch (__addr->sa_family)
+    {
+    case AF_INET:
+      ((struct sockaddr_in *) __addr)->sin_port = ep->port;
+      if (*__len > sizeof (struct sockaddr_in))
+       *__len = sizeof (struct sockaddr_in);
+      sa_len = sizeof (struct sockaddr_in) - sizeof (struct in_addr);
+      copy_len = *__len - sa_len;
+      if (copy_len > 0)
+       memcpy (&((struct sockaddr_in *) __addr)->sin_addr, ep->ip, copy_len);
+      break;
+
+    case AF_INET6:
+      ((struct sockaddr_in6 *) __addr)->sin6_port = ep->port;
+      if (*__len > sizeof (struct sockaddr_in6))
+       *__len = sizeof (struct sockaddr_in6);
+      sa_len = sizeof (struct sockaddr_in6) - sizeof (struct in6_addr);
+      copy_len = *__len - sa_len;
+      if (copy_len > 0)
+       memcpy (((struct sockaddr_in6 *) __addr)->sin6_addr.
+               __in6_u.__u6_addr8, ep->ip, copy_len);
+      break;
+
+    default:
+      /* Not possible */
+      rv = -EAFNOSUPPORT;
+      break;
+    }
+
+  return rv;
+}
+
 int
 vcom_socket_getpeername (int __fd, __SOCKADDR_ARG __addr,
                         socklen_t * __restrict __len)
@@ -1421,7 +1462,8 @@ vcom_socket_getpeername (int __fd, __SOCKADDR_ARG __addr,
   vcom_socket_main_t *vsm = &vcom_socket_main;
   uword *p;
   vcom_socket_t *vsock;
-
+  u8 src_addr[sizeof (struct sockaddr_in6)];
+  vppcom_endpt_t ep;
 
   p = hash_get (vsm->sockidx_by_fd, __fd);
   if (!p)
@@ -1437,31 +1479,10 @@ vcom_socket_getpeername (int __fd, __SOCKADDR_ARG __addr,
   if (!__addr || !__len)
     return -EFAULT;
 
-  vppcom_endpt_t ep;
-  ep.ip = (u8 *) & ((const struct sockaddr_in *) __addr)->sin_addr;
+  ep.ip = src_addr;
   rv = vcom_session_getpeername (vsock->sid, &ep);
   if (rv == 0)
-    {
-      if (ep.vrf == VPPCOM_VRF_DEFAULT)
-       {
-         __addr->sa_family = ep.is_ip4 == VPPCOM_IS_IP4 ? AF_INET : AF_INET6;
-         switch (__addr->sa_family)
-           {
-           case AF_INET:
-             ((struct sockaddr_in *) __addr)->sin_port = ep.port;
-             *__len = sizeof (struct sockaddr_in);
-             break;
-
-           case AF_INET6:
-             ((struct sockaddr_in6 *) __addr)->sin6_port = ep.port;
-             *__len = sizeof (struct sockaddr_in6);
-             break;
-
-           default:
-             break;
-           }
-       }
-    }
+    rv = vcom_socket_copy_ep_to_sockaddr (__addr, __len, &ep);
 
   return rv;
 }
@@ -1633,37 +1654,7 @@ vcom_session_recvfrom (int __sid, void *__restrict __buf, size_t __n,
       rv = vppcom_session_recvfrom (__sid, __buf, __n, __flags, &ep);
 
       if (rv > 0)
-       {
-         if (ep.vrf == VPPCOM_VRF_DEFAULT)
-           {
-             __addr->sa_family =
-               ep.is_ip4 == VPPCOM_IS_IP4 ? AF_INET : AF_INET6;
-             switch (__addr->sa_family)
-               {
-               case AF_INET:
-                 ((struct sockaddr_in *) __addr)->sin_port = ep.port;
-                 memcpy (&((struct sockaddr_in *) __addr)->sin_addr,
-                         src_addr, sizeof (struct in_addr));
-
-                 *__addr_len = sizeof (struct sockaddr_in);
-                 break;
-
-               case AF_INET6:
-                 ((struct sockaddr_in6 *) __addr)->sin6_port = ep.port;
-                 memcpy (((struct sockaddr_in6 *) __addr)->sin6_addr.
-                         __in6_u.__u6_addr8, src_addr,
-                         sizeof (struct in6_addr));
-                 *__addr_len = sizeof (struct sockaddr_in6);
-                 break;
-
-               default:
-                 rv = -EAFNOSUPPORT;
-                 break;
-               }
-           }
-         else
-           rv = -1;
-       }
+       rv = vcom_socket_copy_ep_to_sockaddr (__addr, __addr_len, &ep);
     }
   else
     rv = vppcom_session_recvfrom (__sid, __buf, __n, __flags, NULL);
@@ -2860,7 +2851,7 @@ vcom_socket_epoll_pwait (int __epfd, struct epoll_event *__events,
   int rv = -EBADF;
   int rv2;
   double time_to_wait = (double) 0;
-  double timeout;
+  double timeout, now = 0;
   vcom_epoll_t *vepoll;
   i32 vep_idx;
   static struct epoll_event *libc_ev = 0;
@@ -2875,8 +2866,7 @@ vcom_socket_epoll_pwait (int __epfd, struct epoll_event *__events,
       goto out;
     }
 
-  time_to_wait = ((__timeout > 0) ?
-                 (double) __timeout / (double) 1000 : (double) __timeout);
+  time_to_wait = ((__timeout >= 0) ? (double) __timeout / (double) 1000 : 0);
 
   vep_idx = vcom_socket_get_vep_idx_and_vepoll (__epfd, &vepoll);
   if (vep_idx == INVALID_VEP_IDX)
@@ -2899,7 +2889,8 @@ vcom_socket_epoll_pwait (int __epfd, struct epoll_event *__events,
     {
       if (VCOM_DEBUG > 2)
        fprintf (stderr, "[%d] vcom_socket_epoll_pwait: libc_cnt = 0, "
-                "calling vppcom_epoll_wait()\n", getpid ());
+                "calling vppcom_epoll_wait() time_to_wait = %f\n",
+                getpid (), time_to_wait);
       rv = vppcom_epoll_wait (vep_idx, __events, __maxevents, time_to_wait);
     }
   else if (vepoll->vcl_cnt == 0)
@@ -2913,14 +2904,20 @@ vcom_socket_epoll_pwait (int __epfd, struct epoll_event *__events,
     {
       if (VCOM_DEBUG > 2)
        fprintf (stderr, "[%d] vcom_socket_epoll_pwait: vcl_cnt = %d, "
-                "libc_cnt = %d -> mixed polling\n", getpid (),
-                vepoll->vcl_cnt, vepoll->libc_cnt);
+                "libc_cnt = %d -> mixed polling (time_to_wait = %f, "
+                "__timeout = %d)\n",
+                getpid (), vepoll->vcl_cnt, vepoll->libc_cnt,
+                time_to_wait, __timeout);
       vec_validate (libc_ev, __maxevents);
       timeout = clib_time_now (&vsm->clib_time) + time_to_wait;
       do
        {
          rv = vppcom_epoll_wait (vep_idx, __events, __maxevents, 0);
          rv2 = libc_epoll_pwait (__epfd, libc_ev, __maxevents, 1, __ss);
+         if (VCOM_DEBUG == 666)
+           fprintf (stderr, "[%d] vcom_socket_epoll_pwait: "
+                    "rv = %d, rv2 = %d, timeout = %f, now = %f\n",
+                    getpid (), rv, rv2, timeout, now);
          if ((rv > 0) || (rv2 > 0))
            {
              if (VCOM_DEBUG > 2)
@@ -2949,9 +2946,10 @@ vcom_socket_epoll_pwait (int __epfd, struct epoll_event *__events,
                }
              goto out;
            }
+         if (__timeout != -1)
+           now = clib_time_now (&vsm->clib_time);
        }
-      while ((__timeout == -1)
-            || (clib_time_now (&vsm->clib_time) < timeout));
+      while (now < timeout);
     }
 
 out: