binfmt_misc: correctly account pre-opened interpreters

An 'F' entry, and every interpreter a 'B' entry binds, holds a file open
from registration until the entry goes away, pinning the file, its inode,
the mount it came from and that mount's superblock. Nothing bounds how
many of those a user namespace can hold. An entry binds at most
BINFMT_MISC_INTERP_MAX interpreters, but nothing caps the entries.

Charge each binding to the user namespace and uid that makes it against a
new UCOUNT_BINFMT_MISC_INTERPRETERS. Going over budget causes -ENOSPC.

A per-instance cap would suck. Instances are keyed on the user
namespace. So any constant is multiplied by the number of namespaces the
caller creates. Creating those is virtually free. A ucount charges the
namespace and every one of its ancestors. And a namespace can raise only
its own limit. So nesting buys nothing.

The knob is /proc/sys/user/max_binfmt_misc_interpreters. Leave it at the
max_threads/2 default fork_init() gives a new type. No existing
configuration comes close to that.

binfmt_misc is tristate, which makes it the first ucount user that can be
built as a module. Export inc_ucount() and dec_ucount(); without them
CONFIG_BINFMT_MISC=m fails to link. Export them to binfmt_misc alone:
charging a ucount type is not something a module has any business doing
in general, and the list is trivial to extend if a second user shows up.
init_user_ns and init_binfmt_misc are already exported for the same
module.

Link: https://patch.msgid.link/20260803-work-binfmt_misc-interplimit-v1-1-4a2435500bd9@kernel.org
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2026-08-03 14:15:00 +02:00
parent e98067e72f
commit b604897764
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
4 changed files with 26 additions and 2 deletions

View File

@ -289,6 +289,7 @@ static void entry_put_interpreters(struct binfmt_misc_entry *e)
list_for_each_entry_safe(interp, tmp, &e->interps, list) {
list_del(&interp->list);
close_interp_file(interp->file);
dec_ucount(interp->ucounts, UCOUNT_BINFMT_MISC_INTERPRETERS);
kfree(interp);
}
}
@ -307,7 +308,8 @@ static void entry_put_interpreters(struct binfmt_misc_entry *e)
* The caller has to have validated @name and @path, established that @e
* cannot be matched yet, and owns @f until this succeeds.
*
* Return: 0 on success, a negative errno on failure
* Return: 0 on success, -ENOSPC if the entry is full or the binder is out of
* UCOUNT_BINFMT_MISC_INTERPRETERS budget, a negative errno on failure
*/
static int entry_attach_interpreter(struct binfmt_misc_entry *e,
const char *name, const char *path,
@ -315,22 +317,32 @@ static int entry_attach_interpreter(struct binfmt_misc_entry *e,
{
size_t nlen = strlen(name), plen = strlen(path);
struct binfmt_misc_interp *interp;
struct ucounts *ucounts;
if (binfmt_misc_find_interp(&e->interps, name))
return -EEXIST;
if (list_count_nodes(&e->interps) >= BINFMT_MISC_INTERP_MAX)
return -ENOSPC;
/* The binding keeps a file open, so charge it to whoever binds it. */
ucounts = inc_ucount(current_user_ns(), current_euid(),
UCOUNT_BINFMT_MISC_INTERPRETERS);
if (!ucounts)
return -ENOSPC;
/* One allocation, both strings in it, like the entry's own buffer. */
interp = kmalloc(struct_size(interp, name, nlen + plen + 2),
GFP_KERNEL_ACCOUNT);
if (!interp)
if (!interp) {
dec_ucount(ucounts, UCOUNT_BINFMT_MISC_INTERPRETERS);
return -ENOMEM;
}
interp->path = interp->name + nlen + 1;
strscpy(interp->name, name, nlen + 1);
strscpy(interp->name + nlen + 1, path, plen + 1);
interp->file = f;
interp->ucounts = ucounts;
/* Publish the node: a lockless cat may be walking the list. */
list_add_tail_rcu(&interp->list, &e->interps);
pr_debug("register: interpreter: %s {%s}\n", name, path);

View File

@ -7,6 +7,7 @@
struct bpf_prog;
struct file;
struct linux_binprm;
struct ucounts;
struct user_namespace;
#define BINFMT_MISC_OPS_NAME_MAX 16
@ -21,6 +22,7 @@ struct user_namespace;
* struct binfmt_misc_interp - an interpreter an entry was registered with
* @list: link in the entry's list, in registration order
* @file: the file, opened at registration and never resolved again
* @ucounts: the UCOUNT_BINFMT_MISC_INTERPRETERS charge the binding took
* @path: the path it was registered under, used as the name the interpreter
* runs under; stored after @name in the same allocation
* @name: the name the load program selects it by; empty for the fixed
@ -33,6 +35,7 @@ struct user_namespace;
struct binfmt_misc_interp {
struct list_head list;
struct file *file;
struct ucounts *ucounts;
const char *path;
char name[];
};

View File

@ -57,6 +57,9 @@ enum ucount_type {
#ifdef CONFIG_FANOTIFY
UCOUNT_FANOTIFY_GROUPS,
UCOUNT_FANOTIFY_MARKS,
#endif
#if IS_ENABLED(CONFIG_BINFMT_MISC)
UCOUNT_BINFMT_MISC_INTERPRETERS,
#endif
UCOUNT_COUNTS,
};

View File

@ -4,6 +4,7 @@
#include <linux/sysctl.h>
#include <linux/slab.h>
#include <linux/cred.h>
#include <linux/export.h>
#include <linux/hash.h>
#include <linux/kmemleak.h>
#include <linux/user_namespace.h>
@ -89,6 +90,9 @@ static const struct ctl_table user_table[] = {
UCOUNT_ENTRY("max_fanotify_groups"),
UCOUNT_ENTRY("max_fanotify_marks"),
#endif
#if IS_ENABLED(CONFIG_BINFMT_MISC)
UCOUNT_ENTRY("max_binfmt_misc_interpreters"),
#endif
};
#endif /* CONFIG_SYSCTL */
@ -233,6 +237,7 @@ struct ucounts *inc_ucount(struct user_namespace *ns, kuid_t uid,
put_ucounts(ucounts);
return NULL;
}
EXPORT_SYMBOL_FOR_MODULES(inc_ucount, "binfmt_misc");
void dec_ucount(struct ucounts *ucounts, enum ucount_type type)
{
@ -243,6 +248,7 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type)
}
put_ucounts(ucounts);
}
EXPORT_SYMBOL_FOR_MODULES(dec_ucount, "binfmt_misc");
long inc_rlimit_ucounts(struct ucounts *ucounts, enum rlimit_type type, long v)
{