void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed sketchy memcpy logic, also added checks for service RPC ACK

Browse source
This commit is contained in:
Joseph Henry 2016-01-12 12:42:46 -08:00
parent d03a63e055
commit 74e22368b5
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
netcon/RPC.c
View file

@ -21,7 +21,9 @@
static int (*realconnect)(CONNECT_SIG) = 0; static int (*realconnect)(CONNECT_SIG) = 0;
static int (*realsocket)(SOCKET_SIG) = 0; static int (*realsocket)(SOCKET_SIG) = 0;
#ifdef NETCON_INTERCEPT
static int rpc_count; static int rpc_count;
#endif
static pthread_mutex_t lock; static pthread_mutex_t lock;
void rpc_mutex_init() { void rpc_mutex_init() {
@ -115,13 +117,17 @@ int rpc_send_command(char *path, int cmd, int forfd, void *data, int len)
pthread_mutex_lock(&lock); pthread_mutex_lock(&lock);
char c, padding[] = {0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89}; char c, padding[] = {0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89};
char cmdbuf[BUF_SZ], CANARY[TOKEN_SIZE], metabuf[BUF_SZ]; char cmdbuf[BUF_SZ], CANARY[TOKEN_SIZE], metabuf[BUF_SZ];
memcpy(CANARY+CANARY_SIZE, padding, TOKEN_SIZE); memcpy(CANARY+CANARY_SIZE, padding, sizeof(padding));
uint64_t canary_num; uint64_t canary_num;
// ephemeral RPC socket used only for this command // ephemeral RPC socket used only for this command
int rpc_sock = rpc_join(path); int rpc_sock = rpc_join(path);
// Generate token // Generate token
int fdrand = open("/dev/urandom", O_RDONLY); int fdrand = open("/dev/urandom", O_RDONLY);
read(fdrand, &CANARY, CANARY_SIZE);
if(read(fdrand, &CANARY, CANARY_SIZE) < 0) {
fprintf(stderr,"unable to read from /dev/urandom for RPC canary data\n");
return -1;
}
memcpy(&canary_num, CANARY, CANARY_SIZE); memcpy(&canary_num, CANARY, CANARY_SIZE);
cmdbuf[CMD_ID_IDX] = cmd; cmdbuf[CMD_ID_IDX] = cmd;
memcpy(&cmdbuf[CANARY_IDX], &canary_num, CANARY_SIZE); memcpy(&cmdbuf[CANARY_IDX], &canary_num, CANARY_SIZE);
@ -153,7 +159,10 @@ int rpc_send_command(char *path, int cmd, int forfd, void *data, int len)
errno = 0; errno = 0;
} }
// Write token to corresponding data stream // Write token to corresponding data stream
read(rpc_sock, &c, 1); if(read(rpc_sock, &c, 1) < 0) {
fprintf(stderr, "unable to read RPC ACK byte from service.\n");
return -1;
}
if(c == 'z' && n_write > 0 && forfd > -1){ if(c == 'z' && n_write > 0 && forfd > -1){
if(send(forfd, &CANARY, TOKEN_SIZE, 0) < 0) { if(send(forfd, &CANARY, TOKEN_SIZE, 0) < 0) {
fprintf(stderr,"unable to write canary to stream\n"); fprintf(stderr,"unable to write canary to stream\n");

2
netcon/common.inc.c
View file

@ -42,7 +42,7 @@
#ifndef _COMMON_H #ifndef _COMMON_H
#define _COMMON_H 1 #define _COMMON_H 1
#define DEBUG_LEVEL 3 #define DEBUG_LEVEL 0
#define MSG_WARNING 4 #define MSG_WARNING 4
#define MSG_ERROR 1 // Errors #define MSG_ERROR 1 // Errors