summaryrefslogtreecommitdiffhomepage
path: root/src/core/ngx_string.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2017-10-04 21:19:38 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2017-10-04 21:19:38 +0300
commitf57527df8122eb8a99cc3bf419c28aa4d2a3cf9b (patch)
treed3e68baf3d19feb4aeb6874025ee6009cc4653ba /src/core/ngx_string.c
parentcb4dc2720acf49cb8870e5ff4ebd33ad08668e67 (diff)
downloadnginx-f57527df8122eb8a99cc3bf419c28aa4d2a3cf9b.tar.gz
nginx-f57527df8122eb8a99cc3bf419c28aa4d2a3cf9b.tar.bz2
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.c16
1 files changed, 16 insertions, 0 deletions
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)
{