diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-11-17 00:34:31 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-11-17 00:34:31 +0000 |
| commit | 242d55192f268b96957174c1058d8b200508647a (patch) | |
| tree | a7e2ceaf934b052237648c3ccd672a55acb7285a /pkg/sentry/syscalls/linux | |
| parent | 06e77263c317c7b00c6d274e16faacdad87f53e0 (diff) | |
| parent | d48610795d94f4d1a1782bd5372cbb8e0a76931c (diff) | |
Merge release-20201109.0-52-gd48610795 (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_rlimit.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_rlimit.go b/pkg/sentry/syscalls/linux/sys_rlimit.go index 309c183a3..88cd234d1 100644 --- a/pkg/sentry/syscalls/linux/sys_rlimit.go +++ b/pkg/sentry/syscalls/linux/sys_rlimit.go @@ -90,6 +90,9 @@ var setableLimits = map[limits.LimitType]struct{}{ limits.FileSize: {}, limits.MemoryLocked: {}, limits.Stack: {}, + // RSS can be set, but it's not enforced because Linux doesn't enforce it + // either: "This limit has effect only in Linux 2.4.x, x < 30" + limits.Rss: {}, // These are not enforced, but we include them here to avoid returning // EPERM, since some apps expect them to succeed. limits.Core: {}, |