shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

core: bump RLIMIT_NOFILE soft+hard limit for systemd itself in all cases

Browse Source 
Previously we'd do this for PID 1 only. Let's do this when running in
user mode too, because we know we can handle it.
This commit is contained in:
Lennart Poettering 2018-10-01 18:11:52 +02:00
parent c35ee02c61
commit a17c17122c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/main.c
View File

@ -1213,11 +1213,10 @@ static int bump_rlimit_memlock(struct rlimit *saved_rlimit) {
int r; int r;
assert(saved_rlimit); assert(saved_rlimit);
assert(getuid() == 0);
/* BPF_MAP_TYPE_LPM_TRIE bpf maps are charged against RLIMIT_MEMLOCK, even though we have CAP_IPC_LOCK which /* BPF_MAP_TYPE_LPM_TRIE bpf maps are charged against RLIMIT_MEMLOCK, even if we have CAP_IPC_LOCK which should
* should normally disable such checks. We need them to implement IPAccessAllow= and IPAccessDeny=, hence let's * normally disable such checks. We need them to implement IPAccessAllow= and IPAccessDeny=, hence let's bump
* bump the value high enough for the root user. */ * the value high enough for our user. */
if (getrlimit(RLIMIT_MEMLOCK, saved_rlimit) < 0) if (getrlimit(RLIMIT_MEMLOCK, saved_rlimit) < 0)
return log_warning_errno(errno, "Reading RLIMIT_MEMLOCK failed, ignoring: %m"); return log_warning_errno(errno, "Reading RLIMIT_MEMLOCK failed, ignoring: %m");
@ -1936,11 +1935,9 @@ static int initialize_runtime(
if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0)
log_warning_errno(errno, "Failed to make us a subreaper: %m"); log_warning_errno(errno, "Failed to make us a subreaper: %m");
if (arg_system) { /* Bump up RLIMIT_NOFILE for systemd itself */
/* Bump up RLIMIT_NOFILE for systemd itself */ (void) bump_rlimit_nofile(saved_rlimit_nofile);
(void) bump_rlimit_nofile(saved_rlimit_nofile); (void) bump_rlimit_memlock(saved_rlimit_memlock);
(void) bump_rlimit_memlock(saved_rlimit_memlock);
}
return 0; return 0;
} }