From ce6db8f286160fbf71c409416bd43c229b874601 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 17 Apr 2013 11:01:17 +0000 Subject: * ext/socket/rubysocket.h (SOCKLEN_MAX): Defined. * ext/socket/raddrinfo.c (ext/socket/raddrinfo.c): Reject too long Linux abstract socket name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/raddrinfo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/socket/raddrinfo.c') diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index d0d4d85c05..327218f222 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -450,8 +450,10 @@ rsock_unix_sockaddr_len(VALUE path) } else if (RSTRING_PTR(path)[0] == '\0') { /* abstract namespace; see unix(7) for details. */ + if (SOCKLEN_MAX - offsetof(struct sockaddr_un, sun_path) < (size_t)RSTRING_LEN(path)) + rb_raise(rb_eArgError, "Linux abstract socket too long"); return (socklen_t) offsetof(struct sockaddr_un, sun_path) + - RSTRING_LEN(path); + RSTRING_SOCKLEN(path); } else { #endif -- cgit v1.2.3