X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fuml_device.c;h=f35ae0d2a561320796c3094e5d668ce04e2a30b9;hb=28b7a53b6;hp=3e7b8219fc4f000328f3fb482c0aa56695cc5300;hpb=87f96aec8c48327d879c20ff2b789c88a675173d;p=tinc

diff --git a/src/uml_device.c b/src/uml_device.c
index 3e7b8219..f35ae0d2 100644
--- a/src/uml_device.c
+++ b/src/uml_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- UML network socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2017 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2022 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ static int request_fd = -1;
 static int data_fd = -1;
 static int write_fd = -1;
 static int state = 0;
-static char *device_info;
+static const char *device_info = "UML network socket";
 
 enum request_type { REQ_NEW_CONTROL };
 
@@ -47,10 +47,14 @@ static struct request {
 	struct sockaddr_un sock;
 } request;
 
-static struct sockaddr_un data_sun;
+static struct sockaddr_un data_sun = {
+	.sun_family = AF_UNIX,
+};
 
 static bool setup_device(void) {
-	struct sockaddr_un listen_sun;
+	struct sockaddr_un listen_sun = {
+		.sun_family = AF_UNIX,
+	};
 	static const int one = 1;
 	struct {
 		char zero;
@@ -59,13 +63,11 @@ static bool setup_device(void) {
 	} name;
 	struct timeval tv;
 
-	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
-		xasprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+	if(!get_config_string(lookup_config(&config_tree, "Device"), &device)) {
+		xasprintf(&device, RUNSTATEDIR "/%s.umlsocket", identname);
 	}
 
-	get_config_string(lookup_config(config_tree, "Interface"), &iface);
-
-	device_info = "UML network socket";
+	get_config_string(lookup_config(&config_tree, "Interface"), &iface);
 
 	if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno));
@@ -106,8 +108,7 @@ static bool setup_device(void) {
 	name.zero = 0;
 	name.pid = getpid();
 	gettimeofday(&tv, NULL);
-	name.usecs = tv.tv_usec;
-	data_sun.sun_family = AF_UNIX;
+	name.usecs = (int) tv.tv_usec;
 	memcpy(&data_sun.sun_path, &name, sizeof(name));
 
 	if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof(data_sun)) < 0) {
@@ -133,7 +134,11 @@ static bool setup_device(void) {
 		return false;
 	}
 
-	listen_sun.sun_family = AF_UNIX;
+	if(strlen(device) >= sizeof(listen_sun.sun_path)) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "UML socket filename %s is too long!", device);
+		return false;
+	}
+
 	strncpy(listen_sun.sun_path, device, sizeof(listen_sun.sun_path));
 
 	if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof(listen_sun)) < 0) {
@@ -158,7 +163,7 @@ static bool setup_device(void) {
 	return true;
 }
 
-void close_device(void) {
+static void close_device(void) {
 	if(listen_fd >= 0) {
 		close(listen_fd);
 		listen_fd = -1;
@@ -184,16 +189,14 @@ void close_device(void) {
 	free(device);
 	device = NULL;
 
-	if(iface) {
-		free(iface);
-		iface = NULL;
-	}
+	free(iface);
+	iface = NULL;
 
 	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int inlen;
+	ssize_t inlen;
 
 	switch(state) {
 	case 0: {
@@ -240,13 +243,18 @@ static bool read_packet(vpn_packet_t *packet) {
 			return false;
 		}
 
-		if(connect(write_fd, (struct sockkadr *)&request.sock, sizeof(request.sock)) < 0) {
+		if(connect(write_fd, (const struct sockaddr *)&request.sock, sizeof(request.sock)) < 0) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno));
 			event_exit();
 			return false;
 		}
 
-		write(request_fd, &data_sun, sizeof(data_sun));
+		if(write(request_fd, &data_sun, sizeof(data_sun)) != sizeof(data_sun)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while responding to request from %s %s: %s", device_info, device, strerror(errno));
+			event_exit();
+			return false;
+		}
+
 		device_fd = data_fd;
 
 		logger(DEBUG_ALWAYS, LOG_INFO, "Connection with UML established");