kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/unixsocket.c (unix_recv_io): prevent FD leak when 2 fd is

Browse source 
sent on LP64 platform.

* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): declared.

* ext/socket/ancdata.c (rsock_discard_cmsg_resource): renamed from
  discard_cmsg_resource.  export it.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-25 14:03:42 +00:00
parent a898f0fb4b
commit c17b915eb8
4 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Wed Feb 25 23:01:26 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/unixsocket.c (unix_recv_io): prevent FD leak when 2 fd is
sent on LP64 platform.
* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): declared.
* ext/socket/ancdata.c (rsock_discard_cmsg_resource): renamed from
discard_cmsg_resource. export it.
Wed Feb 25 17:31:32 2009 NAKAMURA Usaku <usa@ruby-lang.org> Wed Feb 25 17:31:32 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (sysopen_func, rb_sysopen_internal, rb_sysopen): open file * io.c (sysopen_func, rb_sysopen_internal, rb_sysopen): open file

14
ext/socket/ancdata.c
View file

@ -1300,10 +1300,10 @@ rb_recvmsg(int fd, struct msghdr *msg, int flags)
return rb_thread_blocking_region(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0); return rb_thread_blocking_region(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0);
} }
static void
discard_cmsg_resource(struct msghdr *mh)
{
#if defined(HAVE_ST_MSG_CONTROL) #if defined(HAVE_ST_MSG_CONTROL)
void
rsock_discard_cmsg_resource(struct msghdr *mh)
{
struct cmsghdr *cmh; struct cmsghdr *cmh;
if (mh->msg_controllen == 0) if (mh->msg_controllen == 0)
@ -1319,8 +1319,8 @@ discard_cmsg_resource(struct msghdr *mh)
} }
} }
} }
#endif
} }
#endif
#if defined(HAVE_ST_MSG_CONTROL) #if defined(HAVE_ST_MSG_CONTROL)
static void static void
@ -1505,7 +1505,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
/* there are big space bug truncated. /* there are big space bug truncated.
* file descriptors limit? */ * file descriptors limit? */
if (!gc_done) { if (!gc_done) {
discard_cmsg_resource(&mh); rsock_discard_cmsg_resource(&mh);
goto gc_and_retry; goto gc_and_retry;
} }
} }
@ -1526,14 +1526,14 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
} }
#endif #endif
if (grown) { if (grown) {
discard_cmsg_resource(&mh); rsock_discard_cmsg_resource(&mh);
goto retry; goto retry;
} }
else { else {
grow_buffer = 0; grow_buffer = 0;
if (flags != orig_flags) { if (flags != orig_flags) {
flags = orig_flags; flags = orig_flags;
discard_cmsg_resource(&mh); rsock_discard_cmsg_resource(&mh);
goto retry; goto retry;
} }
} }

4
ext/socket/rubysocket.h
View file

@ -259,6 +259,10 @@ VALUE s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s
VALUE sockopt_new(int family, int level, int optname, VALUE data); VALUE sockopt_new(int family, int level, int optname, VALUE data);
#ifdef HAVE_ST_MSG_CONTROL
void rsock_discard_cmsg_resource(struct msghdr *mh);
#endif
void Init_basicsocket(void); void Init_basicsocket(void);
void Init_ipsocket(void); void Init_ipsocket(void);
void Init_tcpsocket(void); void Init_tcpsocket(void);

26
ext/socket/unixsocket.c
View file

@ -334,6 +334,21 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
rb_sys_fail("recvmsg(2)"); rb_sys_fail("recvmsg(2)");
#if FD_PASSING_BY_MSG_CONTROL #if FD_PASSING_BY_MSG_CONTROL
if (arg.msg.msg_controllen < sizeof(struct cmsghdr)) {
rb_raise(rb_eSocket,
"file descriptor was not passed (msg_controllen=%d smaller than sizeof(struct cmsghdr)=%d)",
(int)arg.msg.msg_controllen, (int)sizeof(struct cmsghdr));
}
if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
rb_raise(rb_eSocket,
"file descriptor was not passed (cmsg_level=%d, %d expected)",
cmsg.hdr.cmsg_level, SOL_SOCKET);
}
if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
rb_raise(rb_eSocket,
"file descriptor was not passed (cmsg_type=%d, %d expected)",
cmsg.hdr.cmsg_type, SCM_RIGHTS);
}
if (arg.msg.msg_controllen < CMSG_LEN(sizeof(int))) { if (arg.msg.msg_controllen < CMSG_LEN(sizeof(int))) {
rb_raise(rb_eSocket, rb_raise(rb_eSocket,
"file descriptor was not passed (msg_controllen=%d smaller than CMSG_LEN(sizeof(int))=%d)", "file descriptor was not passed (msg_controllen=%d smaller than CMSG_LEN(sizeof(int))=%d)",
@ -345,20 +360,11 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
(int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int))); (int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int)));
} }
if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) { if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
rsock_discard_cmsg_resource(&arg.msg);
rb_raise(rb_eSocket, rb_raise(rb_eSocket,
"file descriptor was not passed (cmsg_len=%d, %d expected)", "file descriptor was not passed (cmsg_len=%d, %d expected)",
(int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int))); (int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int)));
} }
if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
rb_raise(rb_eSocket,
"file descriptor was not passed (cmsg_level=%d, %d expected)",
cmsg.hdr.cmsg_level, SOL_SOCKET);
}
if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
rb_raise(rb_eSocket,
"file descriptor was not passed (cmsg_type=%d, %d expected)",
cmsg.hdr.cmsg_type, SCM_RIGHTS);
}
#else #else
if (arg.msg.msg_accrightslen != sizeof(fd)) { if (arg.msg.msg_accrightslen != sizeof(fd)) {
rb_raise(rb_eSocket, rb_raise(rb_eSocket,