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

diff --git a/src/uml_device.c b/src/uml_device.c
index a675b62e..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,9 +134,12 @@ 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));
-	listen_sun.sun_path[sizeof(listen_sun.sun_path) - 1] = 0;
 
 	if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof(listen_sun)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind %s to %s: %s", device_info, device, strerror(errno));
@@ -190,7 +196,7 @@ void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int inlen;
+	ssize_t inlen;
 
 	switch(state) {
 	case 0: {