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_inet.c | |
| parent | 2e1e65a5c0a9f8ba5b7b3ce848176482ba4da654 (diff) | |
| download | nginx-cba23f88ec6740b7f8d6a1383254708a91d37625.tar.gz nginx-cba23f88ec6740b7f8d6a1383254708a91d37625.zip | |
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_inet.c')
| -rw-r--r-- | src/core/ngx_inet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 3bcd3e799..de681870b 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -241,7 +241,9 @@ ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text, size_t len, p = ngx_snprintf(text, len, "unix:%Z"); } else { - p = ngx_snprintf(text, len, "unix:%s%Z", saun->sun_path); + n = ngx_strnlen((u_char *) saun->sun_path, + socklen - offsetof(struct sockaddr_un, sun_path)); + p = ngx_snprintf(text, len, "unix:%*s%Z", n, saun->sun_path); } /* we do not include trailing zero in address length */ |