aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-03-22 18:14:48 +0000
committerUlrich Drepper <drepper@redhat.com>2000-03-22 18:14:48 +0000
commit922809a2e3dbb92b6faae17523d055783295cbdc (patch)
tree92c4afbb315d765768414d30734aaf6285bf4c42
parentee0835df62285caaa5b3ff8aed5ec15358fd123d (diff)
downloadglibc-922809a2e3dbb92b6faae17523d055783295cbdc.tar
glibc-922809a2e3dbb92b6faae17523d055783295cbdc.tar.gz
glibc-922809a2e3dbb92b6faae17523d055783295cbdc.tar.bz2
glibc-922809a2e3dbb92b6faae17523d055783295cbdc.zip
Update.
2000-03-22 Ulrich Drepper <drepper@redhat.com> * inet/getnameinfo.c (getnameinfo): Check that addrlen value is large enough. Patch by YOSHIFUJI Hideaki <yoshfuji@v6.linux.or.jp>. 2000-03-22 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/powerpc/bits/mman.h (MADV_*): Add flags from latest Linux kernel.
-rw-r--r--ChangeLog10
-rw-r--r--inet/getnameinfo.c14
2 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d8d036373..4aabd417f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-22 Ulrich Drepper <drepper@redhat.com>
+
+ * inet/getnameinfo.c (getnameinfo): Check that addrlen value is
+ large enough. Patch by YOSHIFUJI Hideaki <yoshfuji@v6.linux.or.jp>.
+
+2000-03-22 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/powerpc/bits/mman.h (MADV_*): Add flags
+ from latest Linux kernel.
+
2000-03-21 Andreas Jaeger <aj@suse.de>
* Versions.def: Add version 2.1.4.
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 709f9ecbfe..9a0709229e 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -172,8 +172,20 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
int herrno;
char *tmpbuf = alloca (tmpbuflen);
struct hostent th;
+ socklen_t min_addrlen = 0;
- if (sa == NULL)
+ if (sa == NULL || addrlen < sizeof (sa_family_t))
+ return -1;
+
+ switch (sa->sa_family)
+ {
+ case AF_LOCAL:
+ min_addrlen = (socklen_t) (((struct sockaddr_un *) NULL)->sun_path);
+ break;
+ default:
+ min_addrlen = __libc_sa_len (sa->sa_family);
+ }
+ if (addrlen < min_addrlen)
return -1;
if (host != NULL && hostlen > 0)