]> git.baikalelectronics.ru Git - kernel.git/commit
ucounts: Fix systemd LimitNPROC with private users regression
authorEric W. Biederman <ebiederm@xmission.com>
Thu, 24 Feb 2022 14:32:28 +0000 (08:32 -0600)
committerEric W. Biederman <ebiederm@xmission.com>
Fri, 25 Feb 2022 16:40:14 +0000 (10:40 -0600)
commit64bb8dac13a419b26bc92168c6494e5664d601e8
tree23346def96dea0b7f0a82c7eb21f9ab22bc36264
parent5d8a81f50a59a4112507a1f1b72aa6194d2e5be0
ucounts: Fix systemd LimitNPROC with private users regression

Long story short recursively enforcing RLIMIT_NPROC when it is not
enforced on the process that creates a new user namespace, causes
currently working code to fail.  There is no reason to enforce
RLIMIT_NPROC recursively when we don't enforce it normally so update
the code to detect this case.

I would like to simply use capable(CAP_SYS_RESOURCE) to detect when
RLIMIT_NPROC is not enforced upon the caller.  Unfortunately because
RLIMIT_NPROC is charged and checked for enforcement based upon the
real uid, using capable() which is euid based is inconsistent with reality.
Come as close as possible to testing for capable(CAP_SYS_RESOURCE) by
testing for when the real uid would match the conditions when
CAP_SYS_RESOURCE would be present if the real uid was the effective
uid.

Reported-by: Etienne Dechamps <etienne@edechamps.fr>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215596
Link: https://lkml.kernel.org/r/e9589141-cfeb-90cd-2d0e-83a62787239a@edechamps.fr
Link: https://lkml.kernel.org/r/87sfs8jmpz.fsf_-_@email.froward.int.ebiederm.org
Cc: stable@vger.kernel.org
Fixes: 96a6f980d813 ("Reimplement RLIMIT_NPROC on top of ucounts")
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
kernel/user_namespace.c