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

macOS does not allow rlim_cur to be set to RLIM_INFINITY for RLIMIT_NOFILE.

Browse Source 
We need to use OPEN_MAX instead as per the macOS setrlimit manual.
Bug #904
This commit is contained in:
Todd C. Miller
2019-10-29 08:28:52 -06:00
parent 0129f3a72a
commit 0d8062c100
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/limits.c
View File

@@ -37,11 +37,17 @@
#ifdef __linux__ #ifdef __linux__
# include <sys/prctl.h> # include <sys/prctl.h>
#endif #endif
#include <limits.h>
#include "sudo.h" #include "sudo.h"
#ifndef OPEN_MAX
# define OPEN_MAX 256
#endif
static struct saved_limit { static struct saved_limit {
int resource; int resource;
rlim_t fallback;
bool saved; bool saved;
struct rlimit limit; struct rlimit limit;
} saved_limits[] = { } saved_limits[] = {
@@ -51,7 +57,7 @@ static struct saved_limit {
{ RLIMIT_CPU }, { RLIMIT_CPU },
{ RLIMIT_DATA }, { RLIMIT_DATA },
{ RLIMIT_FSIZE }, { RLIMIT_FSIZE },
{ RLIMIT_NOFILE }, { RLIMIT_NOFILE, OPEN_MAX },
#ifdef RLIMIT_NPROC #ifdef RLIMIT_NPROC
{ RLIMIT_NPROC }, { RLIMIT_NPROC },
#endif #endif
@@ -162,6 +168,7 @@ unlimit_sudo(void)
{ {
struct rlimit inf = { RLIM_INFINITY, RLIM_INFINITY }; struct rlimit inf = { RLIM_INFINITY, RLIM_INFINITY };
unsigned int idx; unsigned int idx;
int rc;
debug_decl(unlimit_sudo, SUDO_DEBUG_UTIL) debug_decl(unlimit_sudo, SUDO_DEBUG_UTIL)
/* Set resource limits to unlimited and stash the old values. */ /* Set resource limits to unlimited and stash the old values. */
@@ -172,9 +179,19 @@ unlimit_sudo(void)
lim->saved = true; lim->saved = true;
if (setrlimit(lim->resource, &inf) == -1) { if (setrlimit(lim->resource, &inf) == -1) {
struct rlimit rl = lim->limit; struct rlimit rl = lim->limit;
rl.rlim_cur = rl.rlim_max; rl.rlim_cur = MAX(rl.rlim_max, lim->fallback);
if (setrlimit(lim->resource, &rl) == -1) if ((rc = setrlimit(lim->resource, &rl)) == -1) {
sudo_warn("setrlimit(%d)", lim->resource); if (lim->fallback != 0) {
/* macOS won't set rlim_cur to RLIM_INFINITY for NOFILE */
rc = 0;
if (lim->fallback > lim->limit.rlim_cur) {
rl.rlim_cur = lim->fallback;
rc = setrlimit(lim->resource, &rl);
}
}
if (rc == -1)
sudo_warn("setrlimit(%d)", lim->resource);
}
} }
} }