VCL-LDPRELOAD: Fix more coverity warnings

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

diff --git a/src/vcl/vcom_socket.c b/src/vcl/vcom_socket.c
index 304cebb..5918f6b 100644 (file)
--- a/src/vcl/vcom_socket.c
+++ b/src/vcl/vcom_socket.c
@@ -1512,31 +1512,38 @@ vcom_session_sendto (int __sid, void *__buf, size_t __n,
                     int __flags, __CONST_SOCKADDR_ARG __addr,
                     socklen_t __addr_len)
 {
-  int rv = -1;
-  vppcom_endpt_t ep;
+  vppcom_endpt_t *ep = 0;
 
-  ep.vrf = VPPCOM_VRF_DEFAULT;
-  switch (__addr->sa_family)
+  if (__addr)
     {
-    case AF_INET:
-      ep.is_ip4 = VPPCOM_IS_IP4;
-      ep.ip = (uint8_t *) & ((const struct sockaddr_in *) __addr)->sin_addr;
-      ep.port = (uint16_t) ((const struct sockaddr_in *) __addr)->sin_port;
-      break;
+      vppcom_endpt_t _ep;
 
-    case AF_INET6:
-      ep.is_ip4 = VPPCOM_IS_IP6;
-      ep.ip = (uint8_t *) & ((const struct sockaddr_in6 *) __addr)->sin6_addr;
-      ep.port = (uint16_t) ((const struct sockaddr_in6 *) __addr)->sin6_port;
-      break;
+      ep = &_ep;
+      ep->vrf = VPPCOM_VRF_DEFAULT;
+      switch (__addr->sa_family)
+       {
+       case AF_INET:
+         ep->is_ip4 = VPPCOM_IS_IP4;
+         ep->ip =
+           (uint8_t *) & ((const struct sockaddr_in *) __addr)->sin_addr;
+         ep->port =
+           (uint16_t) ((const struct sockaddr_in *) __addr)->sin_port;
+         break;
 
-    default:
-      return -1;
-    }
+       case AF_INET6:
+         ep->is_ip4 = VPPCOM_IS_IP6;
+         ep->ip =
+           (uint8_t *) & ((const struct sockaddr_in6 *) __addr)->sin6_addr;
+         ep->port =
+           (uint16_t) ((const struct sockaddr_in6 *) __addr)->sin6_port;
+         break;
 
-  rv = vppcom_session_sendto (__sid, __buf, __n, __flags, &ep);
+       default:
+         return -EAFNOSUPPORT;
+       }
+    }
 
-  return rv;
+  return vppcom_session_sendto (__sid, __buf, __n, __flags, ep);;
 }
 
 ssize_t
@@ -1544,7 +1551,6 @@ vcom_socket_sendto (int __fd, const void *__buf, size_t __n,
                    int __flags, __CONST_SOCKADDR_ARG __addr,
                    socklen_t __addr_len)
 {
-  int rv = -1;
   vcom_socket_main_t *vsm = &vcom_socket_main;
   uword *p;
   vcom_socket_t *vsock;
@@ -1590,9 +1596,8 @@ vcom_socket_sendto (int __fd, const void *__buf, size_t __n,
        }
     }
 
-  rv = vcom_session_sendto (vsock->sid, (void *) __buf, (int) __n,
-                           __flags, __addr, __addr_len);
-  return rv;
+  return vcom_session_sendto (vsock->sid, (void *) __buf, (int) __n,
+                             __flags, __addr, __addr_len);
 }
 
 static inline ssize_t
@@ -1602,10 +1607,11 @@ vcom_session_recvfrom (int __sid, void *__restrict __buf, size_t __n,
 {
   int rv;
   vppcom_endpt_t ep;
+  u8 src_addr[sizeof (struct sockaddr_in6)];
 
   if (__addr)
     {
-      ep.ip = (u8 *) & ((const struct sockaddr_in *) __addr)->sin_addr;
+      ep.ip = src_addr;
       rv = vppcom_session_recvfrom (__sid, __buf, __n, __flags, &ep);
 
       if (rv > 0)
@@ -1618,16 +1624,22 @@ vcom_session_recvfrom (int __sid, void *__restrict __buf, size_t __n,
                {
                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 = -1;
+                 rv = -EAFNOSUPPORT;
                  break;
                }
            }
@@ -1821,6 +1833,9 @@ vcom_socket_getsockopt (int __fd, int __level, int __optname,
   uword *p;
   vcom_socket_t *vsock;
 
+  if (!__optval || !__optlen)
+    return -EINVAL;
+
   p = hash_get (vsm->sockidx_by_fd, __fd);
   if (!p)
     return -EBADF;
@@ -1832,9 +1847,6 @@ vcom_socket_getsockopt (int __fd, int __level, int __optname,
   if (vsock->type != SOCKET_TYPE_VPPCOM_BOUND)
     return -EINVAL;
 
-  if (!__optval && !__optlen)
-    return -EFAULT;
-
   switch (__level)
     {
     case SOL_SOCKET: