diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2017-10-04 21:19:38 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2017-10-04 21:19:38 +0300 |
commit | cba23f88ec6740b7f8d6a1383254708a91d37625 (patch) | |
tree | ab78c0ae17740bdff1d00e8d60a2e59a4d9456bd /src/core/ngx_string.c | |
parent | 2e1e65a5c0a9f8ba5b7b3ce848176482ba4da654 (diff) |
Fixed handling of non-null-terminated unix sockets.
At least FreeBSD, macOS, NetBSD, and OpenBSD can return unix sockets
with non-null-terminated sun_path. Additionally, the address may become
non-null-terminated if it does not fit into the buffer provided and was
truncated (may happen on macOS, NetBSD, and Solaris, which allow unix socket
addresess larger than struct sockaddr_un). As such, ngx_sock_ntop() might
overread the sockaddr provided, as it used "%s" format and thus assumed
null-terminated string.
To fix this, the ngx_strnlen() function was introduced, and it is now used
to calculate correct length of sun_path.
Diffstat (limited to 'src/core/ngx_string.c')
-rw-r--r-- | src/core/ngx_string.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index de10a064d..2ee07bfc8 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -29,6 +29,22 @@ ngx_strlow(u_char *dst, u_char *src, size_t n) } +size_t +ngx_strnlen(u_char *p, size_t n) +{ + size_t i; + + for (i = 0; i < n; i++) { + + if (p[i] == '\0') { + return i; + } + } + + return n; +} + + u_char * ngx_cpystrn(u_char *dst, u_char *src, size_t n) { |