From f57527df8122eb8a99cc3bf419c28aa4d2a3cf9b Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 4 Oct 2017 21:19:38 +0300 Subject: 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. --- src/core/ngx_string.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/core/ngx_string.c') diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index 7a73ef527..568907209 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) { -- cgit