Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jun 2021 03:39:26 +0000 (20:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jun 2021 03:39:26 +0000 (20:39 -0700)
commitc54b245d011855ea91c5beff07f1db74143ce614
tree7982f28c76f578997f342c7255e222dabeffde63
parente17c120f48f7d86ed9fd6e44e9436d32997fd9ec
parent5e6b8a50a7cec5686ee2c4bda1d49899c79a7eae
Merge branch 'for-linus' of git://git./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
19 files changed:
fs/hugetlbfs/inode.c
fs/proc/array.c
include/linux/cred.h
include/linux/hugetlb.h
include/linux/mm.h
include/linux/sched/user.h
include/linux/user_namespace.h
ipc/mqueue.c
kernel/cred.c
kernel/exit.c
kernel/fork.c
kernel/signal.c
kernel/sys.c
kernel/ucount.c
kernel/user_namespace.c
mm/mlock.c
mm/mmap.c
mm/shmem.c
tools/testing/selftests/Makefile