diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-10-15 18:17:57 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-10-15 19:40:51 +0200 |
| commit | 1d261418e280a7918549d638d574fbea08cf79a9 (patch) | |
| tree | 3a95292195764fb424603552a381f498b47ca79d /src/libsystemd/sd-bus/sd-bus.c | |
| parent | 15a3e96f9220c931507456764902ff05d7171318 (diff) | |
| download | systemd-1d261418e280a7918549d638d574fbea08cf79a9.tar.gz | |
sd-bus: make parsing of AF_UNIX socket addresses more strict
Insist on NUL termination, just to be safe rather than sorry. The kernel
doesn't require it, but it's really annoying if people rely on this,
hence refuse this early.
Diffstat (limited to 'src/libsystemd/sd-bus/sd-bus.c')
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 7868e53fb6..d6c0095161 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -730,7 +730,7 @@ static int parse_unix_address(sd_bus *b, const char **p, char **guid) { if (path) { l = strlen(path); - if (l > sizeof(b->sockaddr.un.sun_path)) + if (l >= sizeof(b->sockaddr.un.sun_path)) /* We insist on NUL termination */ return -E2BIG; b->sockaddr.un.sun_family = AF_UNIX; @@ -738,7 +738,7 @@ static int parse_unix_address(sd_bus *b, const char **p, char **guid) { b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l; } else if (abstract) { l = strlen(abstract); - if (l > sizeof(b->sockaddr.un.sun_path) - 1) + if (l >= sizeof(b->sockaddr.un.sun_path) - 1) /* We insist on NUL termination */ return -E2BIG; b->sockaddr.un.sun_family = AF_UNIX; |