[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAG48ez2fWg64nGxDXUQS3695KpVNrakAbarXJnYPd6xv5wOD+A@mail.gmail.com>
Date: Fri, 12 Oct 2018 02:35:28 +0200
From: Jann Horn <jannh@...gle.com>
To: rick.p.edgecombe@...el.com
Cc: Kernel Hardening <kernel-hardening@...ts.openwall.com>,
Daniel Borkmann <daniel@...earbox.net>, Kees Cook <keescook@...omium.org>,
Catalin Marinas <catalin.marinas@....com>, Will Deacon <will.deacon@....com>,
"David S. Miller" <davem@...emloft.net>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>, "the arch/x86 maintainers" <x86@...nel.org>, Arnd Bergmann <arnd@...db.de>, jeyu@...nel.org,
linux-arm-kernel@...ts.infradead.org,
kernel list <linux-kernel@...r.kernel.org>, linux-mips@...ux-mips.org,
linux-s390 <linux-s390@...r.kernel.org>, sparclinux@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-arch <linux-arch@...r.kernel.org>,
kristen@...ux.intel.com, Dave Hansen <dave.hansen@...el.com>,
Arjan van de Ven <arjan@...ux.intel.com>, deneen.t.dock@...el.com
Subject: Re: [PATCH v2 1/7] modules: Create rlimit for module space
On Fri, Oct 12, 2018 at 1:40 AM Rick Edgecombe
<rick.p.edgecombe@...el.com> wrote:
> This introduces a new rlimit, RLIMIT_MODSPACE, which limits the amount of
> module space a user can use. The intention is to be able to limit module space
> allocations that may come from un-privlidged users inserting e/BPF filters.
Note that in some configurations (iirc e.g. the default Ubuntu
config), normal users can use the subuid mechanism (the /etc/subuid
config file and the /usr/bin/newuidmap setuid helper) to gain access
to 65536 UIDs, which means that in such a configuration,
RLIMIT_MODSPACE*65537 is the actual limit for one user. (Same thing
applies to RLIMIT_MEMLOCK.)
Also, it is probably possible to waste a few times as much virtual
memory as permitted by the limit by deliberately fragmenting virtual
memory?
> There is unfortunately no cross platform place to perform this accounting
> during allocation in the module space, so instead two helpers are created to be
> inserted into the various arch’s that implement module_alloc. These
> helpers perform the checks and help with tracking. The intention is that they
> an be added to the various arch’s as easily as possible.
nit: s/an/can/
[...]
> diff --git a/kernel/module.c b/kernel/module.c
> index 6746c85511fe..2ef9ed95bf60 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -2110,9 +2110,139 @@ static void free_module_elf(struct module *mod)
> }
> #endif /* CONFIG_LIVEPATCH */
>
> +struct mod_alloc_user {
> + struct rb_node node;
> + unsigned long addr;
> + unsigned long pages;
> + kuid_t uid;
> +};
> +
> +static struct rb_root alloc_users = RB_ROOT;
> +static DEFINE_SPINLOCK(alloc_users_lock);
Why all the rbtree stuff instead of stashing a pointer in struct
vmap_area, or something like that?
[...]
> +int check_inc_mod_rlimit(unsigned long size)
> +{
> + struct user_struct *user = get_current_user();
> + unsigned long modspace_pages = rlimit(RLIMIT_MODSPACE) >> PAGE_SHIFT;
> + unsigned long cur_pages = atomic_long_read(&user->module_vm);
> + unsigned long new_pages = get_mod_page_cnt(size);
> +
> + if (rlimit(RLIMIT_MODSPACE) != RLIM_INFINITY
> + && cur_pages + new_pages > modspace_pages) {
> + free_uid(user);
> + return 1;
> + }
> +
> + atomic_long_add(new_pages, &user->module_vm);
> +
> + if (atomic_long_read(&user->module_vm) > modspace_pages) {
> + atomic_long_sub(new_pages, &user->module_vm);
> + free_uid(user);
> + return 1;
> + }
> +
> + free_uid(user);
If you drop the reference on the user_struct, an attacker with two
UIDs can charge module allocations to UID A, keep the associated
sockets alive as UID B, and then log out and back in again as UID A.
At that point, nobody is charged for the module space anymore. If you
look at the eBPF implementation, you'll see that
bpf_prog_charge_memlock() actually stores a refcounted pointer to the
user_struct.
> + return 0;
> +}
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
