diff options
author | hrs <hrs@FreeBSD.org> | 2015-11-03 00:46:06 +0000 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2015-11-03 00:46:06 +0000 |
commit | b687b6568b05675174c1d1df9588eb73a71d8c29 (patch) | |
tree | ef9a53751e18ca02219219d6db1facc341640817 /lib/libc/net | |
parent | 1aa2979768803e3f6be8f69127fc57c289684dac (diff) | |
download | FreeBSD-src-b687b6568b05675174c1d1df9588eb73a71d8c29.zip FreeBSD-src-b687b6568b05675174c1d1df9588eb73a71d8c29.tar.gz |
sdl->sdl_len in sockaddr_dl can be longer than
sizeof(struct sockaddr_dl).
Diffstat (limited to 'lib/libc/net')
-rw-r--r-- | lib/libc/net/getnameinfo.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index c813189..4b7aecb 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -122,7 +122,8 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, afd = find_afd(sa->sa_family); if (afd == NULL) return (EAI_FAMILY); - if (sa->sa_family == PF_LOCAL) { + switch (sa->sa_family) { + case PF_LOCAL: /* * PF_LOCAL uses variable sa->sa_len depending on the * content length of sun_path. Require 1 byte in @@ -132,8 +133,17 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, salen <= afd->a_socklen - sizeofmember(struct sockaddr_un, sun_path)) return (EAI_FAIL); - } else if (salen != afd->a_socklen) - return (EAI_FAIL); + break; + case PF_LINK: + if (salen <= afd->a_socklen - + sizeofmember(struct sockaddr_dl, sdl_data)) + return (EAI_FAIL); + break; + default: + if (salen != afd->a_socklen) + return (EAI_FAIL); + break; + } return ((*afd->a_func)(afd, sa, salen, host, hostlen, serv, servlen, flags)); |