diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-07 02:34:17 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-07 02:34:17 +0200 |
| commit | 0e098b15c76e222f7de381203c0c35a75a5b2f24 (patch) | |
| tree | 864b2b06696c7fcc4d0c29daa3121574c52f004b /src/socket-util.c | |
| parent | e983b76024342278a0377eae116c925f2567776e (diff) | |
util: never use sizeof(sa_family_t) when calculating sockaddr sizes
Diffstat (limited to 'src/socket-util.c')
| -rw-r--r-- | src/socket-util.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/socket-util.c b/src/socket-util.c index 3f4d65a4c8..a2fa13e594 100644 --- a/src/socket-util.c +++ b/src/socket-util.c @@ -29,13 +29,14 @@ #include <net/if.h> #include <sys/types.h> #include <sys/stat.h> +#include <stddef.h> +#include <sys/ioctl.h> #include "macro.h" #include "util.h" #include "socket-util.h" #include "missing.h" #include "label.h" -#include <sys/ioctl.h> int socket_address_parse(SocketAddress *a, const char *s) { int r; @@ -96,7 +97,7 @@ int socket_address_parse(SocketAddress *a, const char *s) { a->sockaddr.un.sun_family = AF_UNIX; memcpy(a->sockaddr.un.sun_path, s, l); - a->size = sizeof(sa_family_t) + l + 1; + a->size = offsetof(struct sockaddr_un, sun_path) + l + 1; } else if (*s == '@') { /* Abstract AF_UNIX socket */ @@ -108,7 +109,7 @@ int socket_address_parse(SocketAddress *a, const char *s) { a->sockaddr.un.sun_family = AF_UNIX; memcpy(a->sockaddr.un.sun_path+1, s+1, l); - a->size = sizeof(sa_family_t) + 1 + l; + a->size = offsetof(struct sockaddr_un, sun_path) + 1 + l; } else { @@ -211,10 +212,10 @@ int socket_address_verify(const SocketAddress *a) { return 0; case AF_UNIX: - if (a->size < sizeof(sa_family_t)) + if (a->size < offsetof(struct sockaddr_un, sun_path)) return -EINVAL; - if (a->size > sizeof(sa_family_t)) { + if (a->size > offsetof(struct sockaddr_un, sun_path)) { if (a->sockaddr.un.sun_path[0] != 0) { char *e; @@ -223,7 +224,7 @@ int socket_address_verify(const SocketAddress *a) { if (!(e = memchr(a->sockaddr.un.sun_path, 0, sizeof(a->sockaddr.un.sun_path)))) return -EINVAL; - if (a->size != sizeof(sa_family_t) + (e - a->sockaddr.un.sun_path) + 1) + if (a->size != offsetof(struct sockaddr_un, sun_path) + (e - a->sockaddr.un.sun_path) + 1) return -EINVAL; } } @@ -280,7 +281,7 @@ int socket_address_print(const SocketAddress *a, char **p) { case AF_UNIX: { char *ret; - if (a->size <= sizeof(sa_family_t)) { + if (a->size <= offsetof(struct sockaddr_un, sun_path)) { if (!(ret = strdup("<unamed>"))) return -ENOMEM; |