isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Handle EAGAIN like we do ENOMEM from poll() and select().

Browse Source 
On some systems, poll() and select() can return EAGAIN instead
of ENOMEM if there is a kernel resource shortage.  In this case
we just re-enter the event loop and retry.
This commit is contained in:
Todd C. Miller
2020-05-04 11:23:35 -06:00
parent a212ee64e3
commit 0460008c5b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util/event.c
View File

@@ -661,7 +661,7 @@ rescan:
nready = sudo_ev_scan_impl(base, flags); nready = sudo_ev_scan_impl(base, flags);
switch (nready) { switch (nready) {
case -1: case -1:
if (errno == ENOMEM) if (errno == ENOMEM || errno == EAGAIN)
continue; continue;
if (errno == EINTR) { if (errno == EINTR) {
/* Interrupted by signal, check for sigevents. */ /* Interrupted by signal, check for sigevents. */

2
lib/util/event_poll.c
View File

@@ -211,7 +211,7 @@ sudo_ev_scan_impl(struct sudo_event_base *base, int flags)
/* Error: EINTR (signal) or EINVAL (nfds > RLIMIT_NOFILE) */ /* Error: EINTR (signal) or EINVAL (nfds > RLIMIT_NOFILE) */
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO,
"sudo_ev_poll"); "sudo_ev_poll");
debug_return_int(-1); break;
case 0: case 0:
/* Front end will activate timeout events. */ /* Front end will activate timeout events. */
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: timeout", __func__); sudo_debug_printf(SUDO_DEBUG_INFO, "%s: timeout", __func__);

2
lib/util/event_select.c
View File

@@ -234,7 +234,7 @@ sudo_ev_scan_impl(struct sudo_event_base *base, int flags)
switch (nready) { switch (nready) {
case -1: case -1:
/* Error or interrupted by signal. */ /* Error or interrupted by signal. */
debug_return_int(-1); break;
case 0: case 0:
/* Front end will activate timeout events. */ /* Front end will activate timeout events. */
break; break;