X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fuml_device.c;h=a8bedc096a584a473104f4b3bedd0f59a6bd6532;hb=bf81fce8ff7a244ecdfbe2d5535bdf4df07b3f35;hp=dbb13e937b3dbcdc79302ffa2d3e4ba55226f8c0;hpb=38489e37f50e807e51bfd28ebb8b20396eed1447;p=tinc

diff --git a/src/uml_device.c b/src/uml_device.c
index dbb13e93..a8bedc09 100644
--- a/src/uml_device.c
+++ b/src/uml_device.c
@@ -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;
@@ -104,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) {
@@ -131,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) {
@@ -182,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: {
@@ -238,7 +243,7 @@ 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;