execute: when we can't get the requested rlimit, get the next closest

This commit is contained in:
Lennart Poettering 2012-04-12 03:38:52 +02:00
parent d18f337c3f
commit 68faf98ca0
3 changed files with 28 additions and 1 deletions

View file

@ -1367,7 +1367,7 @@ int exec_spawn(ExecCommand *command,
if (!context->rlimit[i])
continue;
if (setrlimit(i, context->rlimit[i]) < 0) {
if (setrlimit_closest(i, context->rlimit[i]) < 0) {
err = -errno;
r = EXIT_LIMITS;
goto fail_child;

View file

@ -6120,3 +6120,27 @@ int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *pa
execv(path, l);
_exit(EXIT_FAILURE);
}
int setrlimit_closest(int resource, const struct rlimit *rlim) {
struct rlimit highest, fixed;
assert(rlim);
if (setrlimit(resource, rlim) >= 0)
return 0;
if (errno != EPERM)
return -errno;
/* So we failed to set the desired setrlimit, then let's try
* to get as close as we can */
assert_se(getrlimit(resource, &highest) == 0);
fixed.rlim_cur = MIN(rlim->rlim_cur, highest.rlim_max);
fixed.rlim_max = MIN(rlim->rlim_max, highest.rlim_max);
if (setrlimit(resource, &fixed) < 0)
return -errno;
return 0;
}

View file

@ -34,6 +34,7 @@
#include <limits.h>
#include <sys/stat.h>
#include <dirent.h>
#include <sys/resource.h>
#include "macro.h"
@ -531,4 +532,6 @@ int fd_inc_rcvbuf(int fd, size_t n);
int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *path, ...);
int setrlimit_closest(int resource, const struct rlimit *rlim);
#endif