summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-12 03:38:52 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-12 12:58:19 +0200
commit68faf98ca09314b61314ad2ac0cc133c400a83f9 (patch)
tree209d19aeced8bfdf54a425f1fe205f42fa455bd8 /src/shared
parentd18f337c3f2fe14240598c18415f72d0cf15393f (diff)
execute: when we can't get the requested rlimit, get the next closest
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/util.c24
-rw-r--r--src/shared/util.h3
2 files changed, 27 insertions, 0 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index a3873a9318..0b4d4d6746 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -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;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
index 3f4e49e6bc..c487b702bf 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -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