rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-15 01:55:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2018-04-01

Browse Source 
Git mirror commit 8dfb1ccc26d1cea7e2529303003ff61f9f1784c4.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-21 09:39:55 +02:00
parent 18fa92c2dc
commit 2df56dbd60
327 changed files with 6676 additions and 3502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
freebsd/lib/libc/net/getnameinfo.c
View File

@@ -126,26 +126,36 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen,
afd = find_afd(sa->sa_family);
if (afd == NULL)
return (EAI_FAMILY);
/*
* getnameinfo() accepts an salen of sizeof(struct sockaddr_storage)
* at maximum as shown in RFC 4038 Sec.6.2.3.
*/
if (salen > sizeof(struct sockaddr_storage))
return (EAI_FAMILY);
switch (sa->sa_family) {
case PF_LOCAL:
/*
* PF_LOCAL uses variable sa->sa_len depending on the
* PF_LOCAL uses variable salen depending on the
* content length of sun_path. Require 1 byte in
* sun_path at least.
*/
if (salen > afd->a_socklen ||
salen <= afd->a_socklen -
if (salen <= afd->a_socklen -
sizeofmember(struct sockaddr_un, sun_path))
return (EAI_FAIL);
return (EAI_FAMILY);
else if (salen > afd->a_socklen)
salen = afd->a_socklen;
break;
case PF_LINK:
if (salen <= afd->a_socklen -
sizeofmember(struct sockaddr_dl, sdl_data))
return (EAI_FAIL);
return (EAI_FAMILY);
break;
default:
if (salen != afd->a_socklen)
return (EAI_FAIL);
if (salen < afd->a_socklen)
return (EAI_FAMILY);
else
salen = afd->a_socklen;
break;
}
@@ -519,7 +529,7 @@ getnameinfo_un(const struct afd *afd,
if (serv != NULL && servlen > 0)
*serv = '\0';
if (host != NULL && hostlen > 0) {
pathlen = sa->sa_len - afd->a_off;
pathlen = salen - afd->a_off;
if (pathlen + 1 > hostlen) {
*host = '\0';