chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
automount: fix segfault when shutting down
[elogind.git]
/
src
/
sd-daemon.c
diff --git
a/src/sd-daemon.c
b/src/sd-daemon.c
index e12fb0483abfb8c4d690ffc62ee51622daa245fb..6d1eebff07c68a977abc325a3c9c3592839a24ee 100644
(file)
--- a/
src/sd-daemon.c
+++ b/
src/sd-daemon.c
@@
-228,7
+228,7
@@
int sd_is_socket(int fd, int family, int type, int listening) {
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
- if (l <
offsetof(struct sockaddr_un, sun_path
))
+ if (l <
sizeof(sa_family_t
))
return -EINVAL;
return sockaddr.sa.sa_family == family;
return -EINVAL;
return sockaddr.sa.sa_family == family;
@@
-254,7
+254,7
@@
int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
- if (l <
offsetof(struct sockaddr_un, sun_path
))
+ if (l <
sizeof(sa_family_t
))
return -EINVAL;
if (sockaddr.sa.sa_family != AF_INET &&
return -EINVAL;
if (sockaddr.sa.sa_family != AF_INET &&
@@
-296,7
+296,7
@@
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
- if (l <
offsetof(struct sockaddr_un, sun_path
))
+ if (l <
sizeof(sa_family_t
))
return -EINVAL;
if (sockaddr.sa.sa_family != AF_UNIX)
return -EINVAL;
if (sockaddr.sa.sa_family != AF_UNIX)