[PATCH] kernel/time: Add max_time_namespaces ucount

* [PATCH] kernel/time: Add max_time_namespaces ucount
@ 2020-04-06 17:13 Dmitry Safonov
  2020-04-07  3:31 ` Andrei Vagin
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Dmitry Safonov @ 2020-04-06 17:13 UTC (permalink / raw)
  To: linux-kernel
  Cc: Dmitry Safonov, Dmitry Safonov, Michael Kerrisk (man-pages),
	Adrian Reber, Andrey Vagin, Christian Brauner, Eric W. Biederman,
	Ingo Molnar, Thomas Gleixner, Vincenzo Frascino, Containers,
	Linux API, stable

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread