Re: [PATCH bpf-next] bpf: Make trampolines W^X

From: Edgecombe, Rick P
Date: Thu Jan 09 2020 - 20:01:08 EST

Next message: Cong Wang: "Re: [PATCH] mm: avoid blocking lock_page() in kcompactd"
Previous message: Anchal Agarwal: "Re: [RFC PATCH V2 01/11] xen/manage: keep track of the on-going suspend mode"
In reply to: Andy Lutomirski: "Re: [PATCH bpf-next] bpf: Make trampolines W^X"
Next in thread: Andy Lutomirski: "Re: [PATCH bpf-next] bpf: Make trampolines W^X"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Wed, 2020-01-08 at 22:48 -0800, Andy Lutomirski wrote:
> > On Jan 8, 2020, at 10:52 AM, Edgecombe, Rick P <rick.p.edgecombe@xxxxxxxxx>
> > wrote:
> >
> > ïOn Wed, 2020-01-08 at 00:41 -0800, Andy Lutomirski wrote:
> > > > On Jan 7, 2020, at 9:01 AM, Edgecombe, Rick P <
> > > > rick.p.edgecombe@xxxxxxxxx>
> > > > wrote:
> > > >
> > > > ïCC Nadav and Jessica.
> > > >
> > > > On Mon, 2020-01-06 at 15:36 -1000, Andy Lutomirski wrote:
> > > > > > On Jan 6, 2020, at 12:25 PM, Edgecombe, Rick P <
> > > > > > rick.p.edgecombe@xxxxxxxxx>
> > > > > > wrote:
> > > > > >
> > > > > > ïOn Sat, 2020-01-04 at 09:49 +0900, Andy Lutomirski wrote:
> > > > > > > > > > On Jan 4, 2020, at 8:47 AM, KP Singh <kpsingh@xxxxxxxxxxxx>
> > > > > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > ïFrom: KP Singh <kpsingh@xxxxxxxxxx>
> > > > > > > > >
> > > > > > > > > The image for the BPF trampolines is allocated with
> > > > > > > > > bpf_jit_alloc_exe_page which marks this allocated page
> > > > > > > > > executable.
> > > > > > > > > This
> > > > > > > > > means that the allocated memory is W and X at the same time
> > > > > > > > > making
> > > > > > > > > it
> > > > > > > > > susceptible to WX based attacks.
> > > > > > > > >
> > > > > > > > > Since the allocated memory is shared between two trampolines
> > > > > > > > > (the
> > > > > > > > > current and the next), 2 pages must be allocated to adhere to
> > > > > > > > > W^X
> > > > > > > > > and
> > > > > > > > > the following sequence is obeyed where trampolines are
> > > > > > > > > modified:
> > > > > > > >
> > > > > > > > Can we please do better rather than piling garbage on top of
> > > > > > > > garbage?
> > > > > > > >
> > > > > > > > >
> > > > > > > > > - Mark memory as non executable (set_memory_nx). While
> > > > > > > > > module_alloc for
> > > > > > > > > x86 allocates the memory as PAGE_KERNEL and not
> > > > > > > > > PAGE_KERNEL_EXEC,
> > > > > > > > > not
> > > > > > > > > all implementations of module_alloc do so
> > > > > > > >
> > > > > > > > How about fixing this instead?
> > > > > > > >
> > > > > > > > > - Mark the memory as read/write (set_memory_rw)
> > > > > > > >
> > > > > > > > Probably harmless, but see above about fixing it.
> > > > > > > >
> > > > > > > > > - Modify the trampoline
> > > > > > > >
> > > > > > > > Seems reasonable. Itâs worth noting that this whole approach is
> > > > > > > > suboptimal:
> > > > > > > > the âmoduleâ allocator should really be returning a list of
> > > > > > > > pages to
> > > > > > > > be
> > > > > > > > written (not at the final address!) with the actual executable
> > > > > > > > mapping to
> > > > > > > > be
> > > > > > > > materialized later, but thatâs a bigger project that youâre
> > > > > > > > welcome
> > > > > > > > to
> > > > > > > > ignore
> > > > > > > > for now. (Concretely, it should produce a vmap address with
> > > > > > > > backing
> > > > > > > > pages
> > > > > > > > but
> > > > > > > > with the vmap alias either entirely unmapped or read-only. A
> > > > > > > > subsequent
> > > > > > > > healer
> > > > > > > > would, all at once, make the direct map pages RO or not-present
> > > > > > > > and
> > > > > > > > make
> > > > > > > > the
> > > > > > > > vmap alias RX.)
> > > > > > > > > - Mark the memory as read-only (set_memory_ro)
> > > > > > > > > - Mark the memory as executable (set_memory_x)
> > > > > > > >
> > > > > > > > No, thanks. Thereâs very little excuse for doing two IPI flushes
> > > > > > > > when one
> > > > > > > > would suffice.
> > > > > > > >
> > > > > > > > As far as I know, all architectures can do this with a single
> > > > > > > > flush
> > > > > > > > without
> > > > > > > > races x86 certainly can. The module freeing code gets this
> > > > > > > > sequence
> > > > > > > > right.
> > > > > > > > Please reuse its mechanism or, if needed, export the relevant
> > > > > > > > interfaces.
> > > > > >
> > > > > > So if I understand this right, some trampolines have been added that
> > > > > > are
> > > > > > currently set as RWX at modification time AND left that way during
> > > > > > runtime?
> > > > > > The
> > > > > > discussion on the order of set_memory_() calls in the commit message
> > > > > > made me
> > > > > > think that this was just a modification time thing at first.
> > > > >
> > > > > Iâm not sure what the status quo is.
> > > > >
> > > > > We really ought to have a genuinely good API for allocation and
> > > > > initialization
> > > > > of text. We can do so much better than set_memory_blahblah.
> > > > >
> > > > > FWIW, I have some ideas about making kernel flushes cheaper. Itâs
> > > > > currently
> > > > > blocked on finding some time and on tglxâs irqtrace work.
> > > > >
> > > >
> > > > Makes sense to me. I guess there are 6 types of text allocations now:
> > > > - These two BPF trampolines
> > > > - BPF JITs
> > > > - Modules
> > > > - Kprobes
> > > > - Ftrace
> > > >
> > > > All doing (or should be doing) pretty much the same thing. I believe
> > > > Jessica
> > > > had
> > > > said at one point that she didn't like all the other features using
> > > > module_alloc() as it was supposed to be just for real modules. Where
> > > > would
> > > > the
> > > > API live?
> > >
> > > New header? This shouldnât matter that much.
> > >
> > > Here are two strawman proposals. All of this is very rough -- the
> > > actual data structures and signatures are likely problematic for
> > > multiple reasons.
> > >
> > > --- First proposal ---
> > >
> > > struct text_allocation {
> > > void *final_addr;
> > > struct page *pages;
> > > int npages;
> > > };
> > >
> > > int text_alloc(struct text_allocation *out, size_t size);
> > >
> > > /* now final_addr is not accessible and pages is writable. */
> > >
> > > int text_freeze(struct text_allocation *alloc);
> > >
> > > /* now pages are not accessible and final_addr is RO. Alternatively,
> > > pages are RO and final_addr is unmapped. */
> > >
> > > int text_finish(struct text_allocation *alloc);
> > >
> > > /* now final_addr is RX. All done. */
> > >
> > > This gets it with just one flush and gives a chance to double-check in
> > > case of race attacks from other CPUs. Double-checking is annoying,
> > > though.
> > >
> > > --- Second proposal ---
> > >
> > > struct text_allocation {
> > > void *final_addr;
> > > /* lots of opaque stuff including an mm_struct */
> > > /* optional: list of struct page, but this isn't obviously useful */
> > > };
> > >
> > > int text_alloc(struct text_allocation *out, size_t size);
> > >
> > > /* Memory is allocated. There is no way to access it at all right
> > > now. The memory is RO or not present in the direct map. */
> > >
> > > void __user *text_activate_mapping(struct text_allocation *out);
> > >
> > > /* Now the text is RW at *user* address given by return value.
> > > Preemption is off if required by use_temporary_mm(). Real user memory
> > > cannot be accessed. */
> > >
> > > void text_deactivate_mapping(struct text_allocation *alloc);
> > >
> > > /* Now the memory is inaccessible again. */
> > >
> > > void text_finalize(struct text_allocation *alloc);
> > >
> > > /* Now it's RX or XO at the final address. */
> > >
> > >
> > > Pros of second approach:
> > >
> > > - Inherently immune to cross-CPU attack. No double-check.
> > >
> > > - If we ever implement a cache of non-direct-mapped, unaliased pages,
> > > then it works with no flushes at all. We could even relax it a bit to
> > > allow non-direct-mapped pages that may have RX / XO aliases but no W
> > > aliases.
> > >
> > > - Can easily access without worrying about page boundaries.
> > >
> > > Cons:
> > >
> > > - The use of a temporary mm is annoying -- you can't copy from user
> > > memory, for example.
> >
> > Probably the first proposal is better for usages where there is a signature
> > that
> > can be checked like modules, because you could more easily check the
> > signature
> > after the text is RO. I guess leaving the direct map as RO could work for
> > the
> > second option too. Both would probably require significant changes to module
> > signature verification though.
>
> This sounds complicated â for decent performance, we want to apply
> alternatives before we make the text RO, at which point verifying the
> signature is awkward at best.
>
> >
> > Just a minor point/clarification, but outside of an enhanced signed module
> > case,
> > I think the cross-CPU attack mitigation can't be full. For example,
> > attacking
> > the verified BPF byte code (which is apparently planned to no longer be RO),
> > or
> > the pointers being loaded into these trampolines. There is always going to
> > be
> > some writable source or pointer to the source, and unless there is a way to
> > verify the end RO result, it's an un-winnable game of whack-a-mole to do it
> > in
> > full. Still the less exposed surfaces the better since the writes we are
> > worrying about in this case are probably not fully arbitrary.
>
> We could use hypervisor- or CR3-based protection. But I agree this is
> tricky and not strictly on topic :)
>
> >
> > I don't see why it would be so bad to require copying data to the kernel
> > before
> > sending it through this process. Nothing copies to final allocation directly
> > from userspace today, and from a perf perspective, how bad is an extra copy
> > when
> > we are saving TLB shootdowns? Are you thinking to protect the data that's
> > being
> > loaded from other CPUs?
>
> Hmm. If thereâs a way to make loading stall, then the cross-cpu attack
> is a nice way to write shell code, so mitigating this has at least
> some value.
>
> >
> > Otherwise, could we lazily clone/sync the original mm into the temporary one
> > to
> > allow this? (possibly totally misguided idea)
>
> That involves allocating a virtual address at a safe position to make
> this work. On architectures like s390, I donât even know if this is
> possible. Even on x86, itâs awkward. I think itâs easier to just say
> that, while the temporary mapping is active, user memory is
> inaccessible.
>
> >
> > FWIW, I really like the idea of a cache of unmapped or RO pages. Potentially
> > several optimizations we could do there.
> >
>
> I guess we would track these pages by the maximum permissions than any
> current or unmapped but unflushed alias has. This lets us get totally
> unmapped or RO pages out of the cache. Or even RX â we could
> potentially allocate, free, and reallocate text without flushing.
>
> > If this API should be cross platform, we might want to abstract the copy
> > itself
> > as well, since other arch's might have non __user solutions for copying data
> > in.
>
> Agreed, although maybe all arches would use âuserâ mappings.
>
> >
> > Unless someone else wants to, I can probably take a look at a first cut of
> > this
> > after I get the current thing I'm working on out. Probably better to let the
> > dust settle on the ftrace changes as well.
>
> That would be great!
>
> Do you know why the change_page_attr code currently does
> vm_unmap_aliases? This is yet more extra expense. I assume the idea
> is that, if weâre changing cache attributes on a non-self-snoop
> machine, we need to kill stale aliases, and we should also kill them
> if weâre reducing permissions. But we currently do it excessively.

I had assumed the RO/RW alias reason, but now I went and looked. I guess it was
first motivated by:
"XEN and PAT and such do not like deferred TLB flushing because they can't
always handle multiple aliasing virtual addresses to a physical address.
They now call vm_unmap_aliases() in order to flush any deferred mappings.
That call is very expensive (well, actually not a lot more expensive than
a single vunmap under the old scheme), however it should be OK if not
called too often."

https://github.com/torvalds/linux/commit/db64fe02258f1507e13fe5212a989922323685ce

For PAT, it must be like you are saying with changes in cache properties...

For XEN page table paravirt not sure if the pageattr.c call was involved or not,
but in any case it looks like it is no longer relevant. First it was changed to
eagerly flushing when under XEN pv (d2cb214551de8180542a04ec8c86c0c9412c5124),
and then just eagerly marking vmalloc PTEs as unmapped so I guess XEN can see
this and do what it needs to do (64141da587241301ce8638cc945f8b67853156ec).

For "and such"...not sure.

But flushing RW aliases for new RO memory seems valid too even if it wasn't the
intention.

> We should also consider improving vm_unmap_aliases(). As a practical
> matter, vm_unmap_aliases() often does a global flush, but it can't be
> relied on. On the other hand, a global flush initiated for other
> reasons won't tell the vmap code that aliases have been zapped.
>
> If the locking is okay, we could maybe get away with zapping aliases
> from the normal flush code. Alternatively, we could do something
> lockless, e.g.:
>
> atomic64_t kernel_tlb_gen, flushed_kernel_tlb_gen;
>
> flush_tlb_kernel_range(), etc increment kernel_tlb_gen before flushing
> and then update flushed_kernel_tlb_gen to match after flushing.
>
> The vmap code immediately removes PTEs when unmaps occur (which it may
> very well do right now -- I haven't checked) but also tracks the
> kernel_tlb_gen associated with each record of an
> unmapped-but-not-zapped area. Then we split vm_unmap_aliases() into a
> variant that unmaps all aliases and a variant that merely promises to
> unmap at least one alias. The former does what the current code does
> except that it skips the IPI if all areas in question have tlb_gen <
> flushed_kernel_tlb_gen. The latter clears all areas with tlb_gen <
> flushed_kernel_tlb_gen and, if there weren't any, does
> flush_tlb_kernel_range() and flushes everything.
>
> (Major caveat: this is wrong for the case where
> flush_tlb_kernel_range() only flushes some but not all of the kernel.
> So this needs considerable work if it's actually going to me useful.
> The plain old "take locks and clean up" approach might be a better
> bet.)
>

Hmm. In normal usage (!DEBUG_PAGE_ALLOC), are kernel range tlb shootdowns common
outside of module space users and lazy vmap stuff? A tlb_gen solution might only
be worth it in cases where something other than vm_unmap_aliases() and helpers
was doing this frequently.

Next message: Cong Wang: "Re: [PATCH] mm: avoid blocking lock_page() in kcompactd"
Previous message: Anchal Agarwal: "Re: [RFC PATCH V2 01/11] xen/manage: keep track of the on-going suspend mode"
In reply to: Andy Lutomirski: "Re: [PATCH bpf-next] bpf: Make trampolines W^X"
Next in thread: Andy Lutomirski: "Re: [PATCH bpf-next] bpf: Make trampolines W^X"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]