Page MenuHomeFreeBSD
Files F140994304

D14585.id40316.diff
No OneTemporary
Actions

D14585.id40316.diff
View Options

Index: head/lib/libc/net/getnameinfo.3
===================================================================
--- head/lib/libc/net/getnameinfo.3
+++ head/lib/libc/net/getnameinfo.3
@@ -18,7 +18,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 28, 2016
+.Dd March 15, 2018
.Dt GETNAMEINFO 3
.Os
.Sh NAME
@@ -80,6 +80,20 @@
that is
.Fa salen
bytes long.
+If
+.Fa salen
+is shorter than the length corresponding to the specified
+address family or longer than
+.Fn sizeof "struct sockaddr_storage" ,
+it returns
+.Er EAI_FAMILY .
+Note that
+.Va sa->sa_len
+should be consistent with
+.Fa salen
+though the value of
+.Va sa->sa_len
+is not directly used in this function.
.Pp
The host and service names associated with
.Fa sa
Index: head/lib/libc/net/getnameinfo.c
===================================================================
--- head/lib/libc/net/getnameinfo.c
+++ head/lib/libc/net/getnameinfo.c
@@ -124,26 +124,36 @@
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;
}
@@ -517,7 +527,7 @@
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';

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 1:03 PM (9 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27411823
Default Alt Text
D14585.id40316.diff (2 KB)

Event Timeline