diff options
author | hrs <hrs@FreeBSD.org> | 2015-09-13 03:15:37 +0000 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2015-09-13 03:15:37 +0000 |
commit | eb19940746675035d2f9f2cdf7f6f6a281c92e19 (patch) | |
tree | 6373019788bc857e14e5bbda424d28cc6259327b /lib | |
parent | bb012e622f37c85c7d593a76405af73cda55a9e0 (diff) | |
download | FreeBSD-src-eb19940746675035d2f9f2cdf7f6f6a281c92e19.zip FreeBSD-src-eb19940746675035d2f9f2cdf7f6f6a281c92e19.tar.gz |
MFC 287349,287404:
- Print sdl->sdl_data when sdl->sdl_nlen > 0 && sdl->sdl_alen == 0
as link_ntoa(3) does.
- snprintf() returns at most size-1 of the chars printed into
the buffer. (n == hostlen) also means the buffer length was
too short.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/net/getnameinfo.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index f766a8c..2b16b75 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -390,11 +390,22 @@ getnameinfo_link(const struct sockaddr *sa, socklen_t salen, if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 && sdl->sdl_slen == 0) { n = snprintf(host, hostlen, "link#%d", sdl->sdl_index); - if (n > hostlen) { + if (n >= hostlen) { *host = '\0'; - return EAI_MEMORY; + return (EAI_MEMORY); + } + return (0); + } + + if (sdl->sdl_nlen > 0 && sdl->sdl_alen == 0) { + n = sdl->sdl_nlen; + if (n >= hostlen) { + *host = '\0'; + return (EAI_MEMORY); } - return 0; + memcpy(host, sdl->sdl_data, sdl->sdl_nlen); + host[n] = '\0'; + return (0); } switch (sdl->sdl_type) { @@ -437,10 +448,7 @@ getnameinfo_link(const struct sockaddr *sa, socklen_t salen, } static int -hexname(cp, len, host, hostlen) - const u_int8_t *cp; - char *host; - size_t len, hostlen; +hexname(const u_int8_t *cp, size_t len, char *host, size_t hostlen) { int i, n; char *outp = host; |