diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 12:07:05 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 12:07:05 +0000 |
commit | f0e1b959a6d86eb3c1ce9adf4a5c7674b6b3e7db (patch) | |
tree | 853196197cb243eb57b7608b7b40152074ed2776 | |
parent | dcd07242f0e7682072415b1adfe04f3ab12e0da5 (diff) |
merge revision(s) 62991,63000:
unixsocket.c: check NUL bytes
* ext/socket/unixsocket.c (rsock_init_unixsock): check NUL bytes.
https://hackerone.com/reports/302997
unixsocket.c: abstract namespace
* ext/socket/unixsocket.c (unixsock_path_value): fix r62991 for
Linux abstract namespace.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@63003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/socket/unixsocket.c | 24 | ||||
-rw-r--r-- | test/socket/test_unix.rb | 10 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 34 insertions, 2 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 5a44b552f8..75f17d6c10 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -25,6 +25,28 @@ unixsock_connect_internal(VALUE a) arg->sockaddrlen, 0); } +static VALUE +unixsock_path_value(VALUE path) +{ +#ifdef __linux__ +#define TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE 0 + + VALUE name = path; +#if TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE + const int isstr = !NIL_P(name = rb_check_string_type(name)); +#else + const int isstr = RB_TYPE_P(name, T_STRING); +#endif + if (isstr) { + if (RSTRING_LEN(name) == 0 || RSTRING_PTR(name)[0] == '\0') { + rb_check_safe_obj(name); + return name; /* ignore encoding */ + } + } +#endif + return rb_get_path(path); +} + VALUE rsock_init_unixsock(VALUE sock, VALUE path, int server) { @@ -33,7 +55,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server) int fd, status; rb_io_t *fptr; - SafeStringValue(path); + path = unixsock_path_value(path); INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un)); if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) { diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index 7edb5e5d4f..e4408630d4 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -285,6 +285,16 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase File.unlink path if path && File.socket?(path) end + def test_open_nul_byte + tmpfile = Tempfile.new("s") + path = tmpfile.path + tmpfile.close(true) + assert_raise(ArgumentError) {UNIXServer.open(path+"\0")} + assert_raise(ArgumentError) {UNIXSocket.open(path+"\0")} + ensure + File.unlink path if path && File.socket?(path) + end + def test_addr bound_unix_socket(UNIXServer) {|serv, path| UNIXSocket.open(path) {|c| @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 293 +#define RUBY_PATCHLEVEL 294 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |