Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull user namespace rlimit handling update from Eric Biederman: "This is the work mainly by Alexey Gladkov to limit rlimits to the rlimits of the user that created a user namespace, and to allow users to have stricter limits on the resources created within a user namespace." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: cred: add missing return error code when set_cred_ucounts() failed ucounts: Silence warning in dec_rlimit_ucounts ucounts: Set ucount_max to the largest positive value the type can hold kselftests: Add test to check for rlimit changes in different user namespaces Reimplement RLIMIT_MEMLOCK on top of ucounts Reimplement RLIMIT_SIGPENDING on top of ucounts Reimplement RLIMIT_MSGQUEUE on top of ucounts Reimplement RLIMIT_NPROC on top of ucounts Use atomic_t for ucounts reference counting Add a reference to ucounts for each cred Increase size of ucounts to atomic_long_t
Showing
- fs/exec.c 5 additions, 1 deletionfs/exec.c
- fs/hugetlbfs/inode.c 8 additions, 8 deletionsfs/hugetlbfs/inode.c
- fs/proc/array.c 1 addition, 1 deletionfs/proc/array.c
- include/linux/cred.h 4 additions, 0 deletionsinclude/linux/cred.h
- include/linux/hugetlb.h 2 additions, 2 deletionsinclude/linux/hugetlb.h
- include/linux/mm.h 2 additions, 2 deletionsinclude/linux/mm.h
- include/linux/sched/user.h 0 additions, 7 deletionsinclude/linux/sched/user.h
- include/linux/shmem_fs.h 1 addition, 1 deletioninclude/linux/shmem_fs.h
- include/linux/signal_types.h 3 additions, 1 deletioninclude/linux/signal_types.h
- include/linux/user_namespace.h 28 additions, 3 deletionsinclude/linux/user_namespace.h
- ipc/mqueue.c 21 additions, 19 deletionsipc/mqueue.c
- ipc/shm.c 13 additions, 13 deletionsipc/shm.c
- kernel/cred.c 46 additions, 5 deletionskernel/cred.c
- kernel/exit.c 1 addition, 1 deletionkernel/exit.c
- kernel/fork.c 14 additions, 4 deletionskernel/fork.c
- kernel/signal.c 13 additions, 12 deletionskernel/signal.c
- kernel/sys.c 13 additions, 1 deletionkernel/sys.c
- kernel/ucount.c 91 additions, 25 deletionskernel/ucount.c
- kernel/user.c 0 additions, 3 deletionskernel/user.c
- kernel/user_namespace.c 8 additions, 1 deletionkernel/user_namespace.c
Loading
Please register or sign in to comment