* ext/socket/raddrinfo.c (rsock_fd_family): Check sa_len.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ee5db64308..06689cf019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 13 22:06:50 2015  Tanaka Akira  <[email protected]>
+
+	* ext/socket/raddrinfo.c (rsock_fd_family): Check sa_len.
+
 Tue Oct 13 12:14:10 2015  Craig Davison  <[email protected]>
 
 	* ext/socket/rsock_addrinfo (rsock_addrinfo): specify address
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index b42707454a..5bdde2584a 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -524,7 +524,8 @@ rsock_fd_family(int fd)
     struct sockaddr sa = { 0 };
     socklen_t sa_len = sizeof(sa);
 
-    if (fd < 0 || getsockname(fd, &sa, &sa_len) != 0) {
+    if (fd < 0 || getsockname(fd, &sa, &sa_len) != 0 ||
+        sa_len < offsetof(struct sockaddr, sa_family) + sizeof(sa.sa_family)) {
 	return AF_UNSPEC;
     }
     return sa.sa_family;