shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-30 06:25:25 +03:00
Code

[PATCH] udevd - fix socket path length

Browse Source 
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.
This commit is contained in:
kay.sievers@vrfy.org 2004-02-06 00:11:24 -08:00 committed by Greg KH
parent 872344c410
commit 1dadabd79b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
udevd.c
View File

@ -360,6 +360,7 @@ int main(int argc, char *argv[])
int csock; int csock;
struct sockaddr_un saddr; struct sockaddr_un saddr;
struct sockaddr_un caddr; struct sockaddr_un caddr;
socklen_t addrlen;
socklen_t clen; socklen_t clen;
pthread_t cli_tid; pthread_t cli_tid;
pthread_t mgr_msg_tid; pthread_t mgr_msg_tid;
@ -379,6 +380,7 @@ int main(int argc, char *argv[])
saddr.sun_family = AF_LOCAL; saddr.sun_family = AF_LOCAL;
/* use abstract namespace for socket path */ /* use abstract namespace for socket path */
strcpy(&saddr.sun_path[1], UDEVD_SOCK_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); ssock = socket(AF_LOCAL, SOCK_STREAM, 0);
if (ssock == -1) { if (ssock == -1) {
@ -386,7 +388,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
retval = bind(ssock, &saddr, sizeof(saddr)); retval = bind(ssock, &saddr, addrlen);
if (retval < 0) { if (retval < 0) {
dbg("bind failed\n"); dbg("bind failed\n");
goto exit; goto exit;

5
udevsend.c
View File

@ -29,6 +29,7 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
@ -124,6 +125,7 @@ int main(int argc, char* argv[])
struct timespec tspec; struct timespec tspec;
int sock; int sock;
struct sockaddr_un saddr; struct sockaddr_un saddr;
socklen_t addrlen;
#ifdef DEBUG #ifdef DEBUG
init_logging("udevsend"); init_logging("udevsend");
@ -163,9 +165,10 @@ int main(int argc, char* argv[])
saddr.sun_family = AF_LOCAL; saddr.sun_family = AF_LOCAL;
/* use abstract namespace for socket path */ /* use abstract namespace for socket path */
strcpy(&saddr.sun_path[1], UDEVD_SOCK_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 */ /* 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) { if (retval != -1) {
goto send; goto send;
} else { } else {