merge revision(s) 52605,53231,53244: [Backport #11854]

	init.c: is_socket

	* ext/socket/init.c (is_socket): extract predicate to see if the
  given fd is a socket.
	* ext/socket/init.c (rsock_init_sock): check FD after validating

	* test/socket/test_basicsocket.rb (test_for_fd): new
	  [ruby-core:72418] [Bug #11854]


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

4 files changed, 36 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index cbf36d8c44..dd6d4fba61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar  9 03:41:27 2016  Eric Wong  <e@80x24.org>
+
+	* ext/socket/init.c (rsock_init_sock): check FD after validating
+	* test/socket/test_basicsocket.rb (test_for_fd): new
+	  [ruby-core:72418] [Bug #11854]
+
 Wed Mar  9 03:34:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* re.c (reg_names_iter): should consider encoding of regexp.
diff --git a/ext/socket/init.c b/ext/socket/init.c
index c3f33964a8..178aad0948 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -39,24 +39,31 @@ rsock_raise_socket_error(const char *reason, int error)
     rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
 }
 
-VALUE
-rsock_init_sock(VALUE sock, int fd)
+#ifdef _WIN32
+#define is_socket(fd) rb_w32_is_socket(fd)
+#else
+static int
+is_socket(int fd)
 {
-    rb_io_t *fp;
-#ifndef _WIN32
     struct stat sbuf;
 
     if (fstat(fd, &sbuf) < 0)
         rb_sys_fail("fstat(2)");
-    rb_update_max_fd(fd);
-    if (!S_ISSOCK(sbuf.st_mode))
-        rb_raise(rb_eArgError, "not a socket file descriptor");
-#else
-    rb_update_max_fd(fd);
-    if (!rb_w32_is_socket(fd))
-        rb_raise(rb_eArgError, "not a socket file descriptor");
+    return S_ISSOCK(sbuf.st_mode);
+}
 #endif
 
+VALUE
+rsock_init_sock(VALUE sock, int fd)
+{
+    rb_io_t *fp;
+
+    if (!is_socket(fd)) {
+	errno = EBADF;
+	rb_sys_fail("not a socket file descriptor");
+    }
+
+    rb_update_max_fd(fd);
     MakeOpenFile(sock, fp);
     fp->fd = fd;
     fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb
index 59b739e813..218576a2b6 100644
--- a/test/socket/test_basicsocket.rb
+++ b/test/socket/test_basicsocket.rb
@@ -85,4 +85,15 @@ class TestSocket_BasicSocket < Test::Unit::TestCase
       }
     end
   end
+  def test_for_fd
+    assert_raise(Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do
+      BasicSocket.for_fd(-1)
+    end
+    inet_stream do |sock|
+      s = BasicSocket.for_fd(sock.fileno)
+      assert_instance_of BasicSocket, s
+      s.autoclose = false
+      sock.close
+    end
+  end
 end if defined?(BasicSocket)
diff --git a/version.h b/version.h
index 972e1b816b..5ed3fa76d9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-09"
-#define RUBY_PATCHLEVEL 242
+#define RUBY_PATCHLEVEL 243
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3