File 0017-rb_fd_select-raise-exception-on-bad-fd-whe... of Package ruby2.5

Overview Repositories Revisions Requests Users Attributes Meta

File 0017-rb_fd_select-raise-exception-on-bad-fd-when-using-po.patch of Package ruby2.5 (Revision 4848867ac1e053a20becac4c4324211c)

Currently displaying revision 4848867ac1e053a20becac4c4324211c , Show latest

From 0b000101625eaffad92ee143984ceadf1d717554 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 24 Feb 2020 22:43:58 +0100
Subject: [PATCH] rb_fd_select: raise exception on bad fd when using poll()

This aligns interface with select(), losing information saying which fd
is bad.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 thread.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/thread.c b/thread.c
index e71ddf4bddc8..3703f8b7e6cc 100644
--- a/thread.c
+++ b/thread.c
@@ -3807,11 +3807,24 @@ pollfdset_extract(struct rb_pollfdset *pollfdset, rb_fdset_t *fds, int flags)
             rb_fd_set(pollfdset->fds[i].fd, fds);
 }
 
+static bool
+pollfdset_badfd(struct rb_pollfdset *pollfdset)
+{
+    int i;
+
+    for (i = 0; i < pollfdset->n_fds; i++)
+        if (pollfdset->fds[i].revents & POLLNVAL)
+            return true;
+
+    return false;
+}
+
 int
 rb_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *exceptfds, rb_fdset_t *errorfds, struct timeval *timeout)
 {
     struct rb_pollfdset pollfdset;
     int timeout_ms = timeout ? timeout->tv_sec * 1000 + timeout->tv_usec / 1000 : -1;
+    bool badfd;
     int ret;
 
     pollfdset_init(&pollfdset);
@@ -3820,11 +3833,14 @@ rb_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *excep
     if (exceptfds) pollfdset_add(&pollfdset, exceptfds, POLLEX_SET);
     if (errorfds) pollfdset_add(&pollfdset, errorfds, POLLERR_SET);
     ret = poll(pollfdset.fds, pollfdset.n_fds, timeout_ms);
-    if (readfds) pollfdset_extract(&pollfdset, readfds, POLLIN_SET);
-    if (writefds) pollfdset_extract(&pollfdset, writefds, POLLOUT_SET);
-    if (exceptfds) pollfdset_extract(&pollfdset, exceptfds, POLLEX_SET);
-    if (errorfds) pollfdset_extract(&pollfdset, errorfds, POLLERR_SET);
+    if (!(badfd = pollfdset_badfd(&pollfdset))) {
+        if (readfds) pollfdset_extract(&pollfdset, readfds, POLLIN_SET);
+        if (writefds) pollfdset_extract(&pollfdset, writefds, POLLOUT_SET);
+        if (exceptfds) pollfdset_extract(&pollfdset, exceptfds, POLLEX_SET);
+        if (errorfds) pollfdset_extract(&pollfdset, errorfds, POLLERR_SET);
+    }
     pollfdset_term(&pollfdset);
+    if (badfd) rb_exc_raise(rb_syserr_new(EBADF, 0));
     return ret;
 }
 #else /* USE_POLL */
-- 
2.23.0

Places

File 0017-rb_fd_select-raise-exception-on-bad-fd-when-using-po.patch of Package ruby2.5 (Revision 4848867ac1e053a20becac4c4324211c)

Places