From: "Mickaël Salaün" <mic@digikod.net>
To: "Günther Noack" <gnoack@google.com>
Cc: "Mickaël Salaün" <mic@digikod.net>,
"Ada Smith" <adasmithgt@gmail.com>,
"Hungyu Lin" <dennylin0707@gmail.com>,
"James Morris" <jmorris@namei.org>,
"Josef Bacik" <josef@toxicpanda.com>,
"Paul Moore" <paul@paul-moore.com>,
"Serge Hallyn" <serge@hallyn.com>,
"Serge Hallyn" <sergeh@kernel.org>,
kernel-team@cloudflare.com, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: [PATCH v3 4/6] landlock: Mediate CAP_SYS_ADMIN for the admin memory reserve
Date: Wed, 18 Nov 2026 15:52:08 +0100 [thread overview]
Message-ID: <20261118145217.2551053-5-mic@digikod.net> (raw)
In-Reply-To: <20261118145217.2551053-1-mic@digikod.net>
With vm.overcommit_memory=2, __vm_enough_memory() keeps the admin
reserve for callers with CAP_SYS_ADMIN, which cap_vm_enough_memory()
checks with cap_capable(), so a domain denying CAP_SYS_ADMIN cannot
withhold this reserve, meant for an administrator to recover from memory
exhaustion.
Add a Landlock vm_enough_memory hook that withholds the reserve when the
domain denies CAP_SYS_ADMIN. Like commoncap and SELinux, do not audit
this check: it runs for every accounted mapping and only selects a
limit.
Cc: Günther Noack <gnoack@google.com>
Cc: Paul Moore <paul@paul-moore.com>
Cc: Serge Hallyn <serge@hallyn.com>
Acked-by: Serge Hallyn (AMD) <sergeh@kernel.org>
Reviewed-by: Günther Noack <gnoack@google.com>
Fixes: 97c8386f1d74 ("landlock: Enforce capability restrictions")
Signed-off-by: Mickaël Salaün <mic@digikod.net>
---
Changes since v2:
https://patch.msgid.link/20261117101157.2520463-5-mic@digikod.net
- Shorten the commit message.
- Add Günther Noack's Reviewed-by.
Changes since v1:
https://patch.msgid.link/20261110202436.2408244-5-mic@digikod.net
- Add Serge Hallyn's Acked-by.
---
security/landlock/cap.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/security/landlock/cap.c b/security/landlock/cap.c
index cdb95b979eaa..caf514be3df0 100644
--- a/security/landlock/cap.c
+++ b/security/landlock/cap.c
@@ -141,10 +141,32 @@ static int hook_mmap_addr(unsigned long addr)
return check_cap(current_cred(), CAP_SYS_RAWIO, CAP_OPT_NONE);
}
+/**
+ * hook_vm_enough_memory - Restrict the admin memory reserve
+ *
+ * @mm: Address space being charged (unused).
+ * @pages: Number of pages being charged (unused).
+ *
+ * cap_vm_enough_memory() lets CAP_SYS_ADMIN use the vm.admin_reserve_kbytes
+ * reserve, but calls cap_capable() directly, which skips hook_capable(). Check
+ * the same capability against the domain. commoncap runs first, so this only
+ * sees tasks that commoncap let use the reserve. Like commoncap, do not log
+ * denials: this only selects a memory limit.
+ *
+ * Return: 0 if the domain does not withhold the reserve, -EPERM if
+ * CAP_SYS_ADMIN use is denied. An error does not fail the allocation by
+ * itself, but without the reserve, the allocation may fail with -ENOMEM.
+ */
+static int hook_vm_enough_memory(struct mm_struct *mm, long pages)
+{
+ return check_cap(current_cred(), CAP_SYS_ADMIN, CAP_OPT_NOAUDIT);
+}
+
static struct security_hook_list landlock_hooks[] __ro_after_init = {
LSM_HOOK_INIT(capable, hook_capable),
LSM_HOOK_INIT(capset, hook_capset),
LSM_HOOK_INIT(mmap_addr, hook_mmap_addr),
+ LSM_HOOK_INIT(vm_enough_memory, hook_vm_enough_memory),
};
__init void landlock_add_cap_hooks(void)
--
2.56.0
next prev parent reply other threads:[~2026-11-18 14:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 14:52 [PATCH v3 0/6] Fix Landlock mediation of commoncap's capability checks Mickaël Salaün
2026-11-18 14:52 ` [PATCH v3 1/6] landlock: Factor out capability denial checks Mickaël Salaün
2026-11-18 14:55 ` sashiko-bot
2026-11-18 14:52 ` [PATCH v3 2/6] landlock: Mediate CAP_SYS_RAWIO for mappings below mmap_min_addr Mickaël Salaün
2026-11-18 14:57 ` sashiko-bot
2026-11-18 14:52 ` [PATCH v3 3/6] landlock: Mediate CAP_SETPCAP for inheritable capabilities Mickaël Salaün
2026-11-18 14:58 ` sashiko-bot
2026-11-18 14:52 ` Mickaël Salaün [this message]
2026-11-18 14:56 ` [PATCH v3 4/6] landlock: Mediate CAP_SYS_ADMIN for the admin memory reserve sashiko-bot
2026-11-18 14:52 ` [PATCH v3 5/6] selftests/landlock: Test capability checks outside the capable hook Mickaël Salaün
2026-11-18 14:58 ` sashiko-bot
2026-11-18 14:52 ` [PATCH v3 6/6] landlock: Fix capability restriction documentation Mickaël Salaün
2026-11-18 14:55 ` sashiko-bot
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=20261118145217.2551053-5-mic@digikod.net \
--to=mic@digikod.net \
--cc=adasmithgt@gmail.com \
--cc=dennylin0707@gmail.com \
--cc=gnoack@google.com \
--cc=jmorris@namei.org \
--cc=josef@toxicpanda.com \
--cc=kernel-team@cloudflare.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--cc=sergeh@kernel.org \
/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