diff options
author | Alexey Gladkov <legion@kernel.org> | 2021-04-22 14:27:14 +0200 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2021-04-30 14:14:02 -0500 |
commit | d7c9e99aee48e6bc0b427f3e3c658a6aba15001e (patch) | |
tree | 61da3b62f597bf4d3658ce6d3198f7e4ae4ddf37 /include/linux/sched | |
parent | d64696905554e919321e31afc210606653b8f6a4 (diff) | |
download | linux-stable-d7c9e99aee48e6bc0b427f3e3c658a6aba15001e.tar.gz linux-stable-d7c9e99aee48e6bc0b427f3e3c658a6aba15001e.tar.bz2 linux-stable-d7c9e99aee48e6bc0b427f3e3c658a6aba15001e.zip |
Reimplement RLIMIT_MEMLOCK on top of ucounts
The rlimit counter is tied to uid in the user_namespace. This allows
rlimit values to be specified in userns even if they are already
globally exceeded by the user. However, the value of the previous
user_namespaces cannot be exceeded.
Changelog
v11:
* Fix issue found by lkp robot.
v8:
* Fix issues found by lkp-tests project.
v7:
* Keep only ucounts for RLIMIT_MEMLOCK checks instead of struct cred.
v6:
* Fix bug in hugetlb_file_setup() detected by trinity.
Reported-by: kernel test robot <oliver.sang@intel.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Alexey Gladkov <legion@kernel.org>
Link: https://lkml.kernel.org/r/970d50c70c71bfd4496e0e8d2a0a32feebebb350.1619094428.git.legion@kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/sched')
-rw-r--r-- | include/linux/sched/user.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index 8ba9cec4fb99..82bd2532da6b 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -18,7 +18,6 @@ struct user_struct { #ifdef CONFIG_EPOLL atomic_long_t epoll_watches; /* The number of file descriptors currently watched */ #endif - unsigned long locked_shm; /* How many pages of mlocked shm ? */ unsigned long unix_inflight; /* How many files in flight in unix sockets */ atomic_long_t pipe_bufs; /* how many pages are allocated in pipe buffers */ |