github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 21:33:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added some parameter checks from linux kernel syscall source

Browse source
This commit is contained in:
Joseph Henry 2015-10-13 14:27:30 -04:00
commit 73145de618
4 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
netcon/intercept.c
View file

@ -66,12 +66,19 @@ char *progname = "";
#include <sys/mman.h>
#ifdef USE_SOCKS_DNS
#include <resolv.h>
#include <resolv.h>
#endif
#include "intercept.h"
#include "common.h"
#ifdef CHECKS
#include <linux/net.h> /* for NPROTO */
#define SOCK_MAX (SOCK_PACKET + 1)
#define SOCK_TYPE_MASK 0xf
#endif
/* Global Declarations */
#ifdef USE_SOCKS_DNS
static int (*realresinit)(void);
@ -504,8 +511,21 @@ void sock_domain_to_str(int domain)
/* int socket_family, int socket_type, int protocol
socket() intercept function */
int socket(SOCKET_SIG)
{
#ifdef CHECKS
/* Check protocol is in range */
if (socket_family < 0 || socket_family >= NPROTO)
return -EAFNOSUPPORT;
if (socket_type < 0 || socket_type >= SOCK_MAX)
return -EINVAL;
/* Check that type makes sense */
int flags = socket_type & ~SOCK_TYPE_MASK;
if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
return -EINVAL;
#endif
#ifdef DUMMY
dwr("socket(fam=%d, type=%d, prot=%d)\n", socket_family, socket_type, protocol);
return realsocket(socket_family, socket_type, protocol);
@ -520,9 +540,6 @@ int socket(SOCKET_SIG)
return realsocket(socket_family, socket_type, protocol);
}
/* FIXME: Check type, protocol, return EINVAL errno */
/* FIXME: Check family, return EAFNOSUPPORT errno */
/* Assemble and route command */
struct socket_st rpc_st;
rpc_st.socket_family = socket_family;
@ -573,6 +590,9 @@ int socket(SOCKET_SIG)
connect() intercept function */
int connect(CONNECT_SIG)
{
/* FIXME: Check that address is in user space, return EFAULT ? */
#ifdef DUMMY
dwr("connect(%d)\n", __fd);
return realconnect(__fd, __addr, __len);
@ -728,6 +748,10 @@ int bind(BIND_SIG)
/* int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags */
int accept4(ACCEPT4_SIG)
{
#ifdef CHECKS
if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
return -EINVAL;
#endif
#ifdef DUMMY
dwr("accept4(%d)\n", sockfd);
return accept(sockfd, addr, addrlen);
@ -816,6 +840,9 @@ int accept(ACCEPT_SIG)
listen() intercept function */
int listen(LISTEN_SIG)
{
/* FIXME: Check that this socket supports listen(), return EOPNOTSUPP */
/* FIXME: Check that the provided fd is a socket, return ENOTSOCK */
#ifdef DUMMY
dwr("listen(%d)\n", sockfd);
return reallisten(sockfd, backlog);