diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-10-26 14:47:06 -0400 |
|---|---|---|
| committer |   Chris Luke <chris_luke@comcast.com> | 2017-10-26 21:22:58 +0000 |
| commit | 617dffaee47fc6fbc0dca85dc07c53ca9b57bf90 (patch) | |
| tree | 3feaa2d422b4c6e7baf7867328d1be74b51d713e /src/vcl/vcom_socket.c | |
| parent | 8184ebd1dae921489cb494e32f026886a1990b6a (diff) | |
VCL-LDPRELOAD: Fix CID 178251 & CID 178253
- CID 178251 Dereference after null check in vcom_socket.c
- CID 178253 Logically dead code in vppcom.c
Change-Id: I2a24cd53727fec76cf1a6d60f90414ff92567818
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'src/vcl/vcom_socket.c')
| -rw-r--r-- | src/vcl/vcom_socket.c | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/src/vcl/vcom_socket.c b/src/vcl/vcom_socket.c index 304cebb8f9b..6ce15148d21 100644 --- 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 |