From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Dmitry Safonov <dima@arista.com>,
"Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>,
Adrian Reber <adrian@lisas.de>, Andrey Vagin <avagin@openvz.org>,
Christian Brauner <christian.brauner@ubuntu.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Containers <containers@lists.linux-foundation.org>,
Linux API <linux-api@vger.kernel.org>,
stable@kernel.org
Subject: [PATCH] kernel/time: Add max_time_namespaces ucount
Date: Mon, 6 Apr 2020 18:13:42 +0100 [thread overview]
Message-ID: <20200406171342.128733-1-dima@arista.com> (raw)
Introduce missing time namespaces limit per-userns.
Michael noticed that userns limit for number of time namespaces is
missing.
Furthermore, time namespace introduced UCOUNT_TIME_NAMESPACES, but
didn't introduce an array member in user_table[]. It would make array's
initialisation OOB write, but by luck the user_table array has
an excessive empty member (all accesses to the array are limited with
UCOUNT_COUNTS - so it silently reuses the last free member.
Fixes user-visible regression: max_inotify_instances by reason of the
missing UCOUNT_ENTRY() has limited max number of namespaces instead of
the number of inotify instances.
Fixes: 769071ac9f20 ("ns: Introduce Time Namespace")
Cc: Adrian Reber <adrian@lisas.de>
Cc: Andrey Vagin <avagin@openvz.org>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Containers <containers@lists.linux-foundation.org>
Cc: Linux API <linux-api@vger.kernel.org>
Cc: stable@kernel.org # v5.6+
Reported-by: Michael Kerrisk (man-pages) <mtk.manpages@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
Documentation/admin-guide/sysctl/user.rst | 6 ++++++
kernel/ucount.c | 1 +
2 files changed, 7 insertions(+)
diff --git a/Documentation/admin-guide/sysctl/user.rst b/Documentation/admin-guide/sysctl/user.rst
index 650eaa03f15e..c45824589339 100644
--- a/Documentation/admin-guide/sysctl/user.rst
+++ b/Documentation/admin-guide/sysctl/user.rst
@@ -65,6 +65,12 @@ max_pid_namespaces
The maximum number of pid namespaces that any user in the current
user namespace may create.
+max_time_namespaces
+===================
+
+ The maximum number of time namespaces that any user in the current
+ user namespace may create.
+
max_user_namespaces
===================
diff --git a/kernel/ucount.c b/kernel/ucount.c
index a53cc2b4179c..29c60eb4ec9b 100644
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -69,6 +69,7 @@ static struct ctl_table user_table[] = {
UCOUNT_ENTRY("max_net_namespaces"),
UCOUNT_ENTRY("max_mnt_namespaces"),
UCOUNT_ENTRY("max_cgroup_namespaces"),
+ UCOUNT_ENTRY("max_time_namespaces"),
#ifdef CONFIG_INOTIFY_USER
UCOUNT_ENTRY("max_inotify_instances"),
UCOUNT_ENTRY("max_inotify_watches"),
--
2.26.0
next reply other threads:[~2020-04-06 17:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 17:13 Dmitry Safonov [this message]
2020-04-07 3:31 ` [PATCH] kernel/time: Add max_time_namespaces ucount Andrei Vagin
2020-04-07 8:22 ` Michael Kerrisk (man-pages)
2020-04-07 9:16 ` Vincenzo Frascino
2020-04-07 10:43 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200406171342.128733-1-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=adrian@lisas.de \
--cc=avagin@openvz.org \
--cc=christian.brauner@ubuntu.com \
--cc=containers@lists.linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mtk.manpages@gmail.com \
--cc=stable@kernel.org \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).