From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Fri, 6 Feb 2004 08:11:24 +0000 (-0800)
Subject: [PATCH] udevd - fix socket path length
X-Git-Tag: 017~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1dadabd79b28a4cd72382abf746e9cf4c0589617

[PATCH] udevd - fix socket path length

It seems that the guys are no longer differ about the right size of the
socket address :)

The kernel simply takes all bytes until the specified length as the name,
so the real length should be enough.
---

diff --git a/udevd.c b/udevd.c
index 24cf9c9a7..10d67f2c3 100644
--- a/udevd.c
+++ b/udevd.c
@@ -360,6 +360,7 @@ int main(int argc, char *argv[])
 	int csock;
 	struct sockaddr_un saddr;
 	struct sockaddr_un caddr;
+	socklen_t addrlen;
 	socklen_t clen;
 	pthread_t cli_tid;
 	pthread_t mgr_msg_tid;
@@ -379,6 +380,7 @@ int main(int argc, char *argv[])
 	saddr.sun_family = AF_LOCAL;
 	/* use abstract namespace for socket path */
 	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
 	ssock = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if (ssock == -1) {
@@ -386,7 +388,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	retval = bind(ssock, &saddr, sizeof(saddr));
+	retval = bind(ssock, &saddr, addrlen);
 	if (retval < 0) {
 		dbg("bind failed\n");
 		goto exit;
diff --git a/udevsend.c b/udevsend.c
index 223647785..246a097f2 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
@@ -124,6 +125,7 @@ int main(int argc, char* argv[])
 	struct timespec tspec;
 	int sock;
 	struct sockaddr_un saddr;
+	socklen_t addrlen;
 
 #ifdef DEBUG
 	init_logging("udevsend");
@@ -163,9 +165,10 @@ int main(int argc, char* argv[])
 	saddr.sun_family = AF_LOCAL;
 	/* use abstract namespace for socket path */
 	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
 	/* try to connect, if it fails start daemon */
-	retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
+	retval = connect(sock, (struct sockaddr *) &saddr, addrlen);
 	if (retval != -1) {
 		goto send;
 	} else {