|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2] memory: check incoming GFNs
On Mon, Jul 20, 2026 at 9:55 AM Jan Beulich <jbeulich@xxxxxxxx> wrote:
>
> P2M handling (for translated domains) is at best undefined when passing in
> GFNs which aren't aligned according to the requested order.
>
> For non-translated domains the same isn't necessarily true, and domains
> may possibly be able to leverage present behavior; in fact
> XENMEM_memory_exchange is known to be used in such ways. Instead the
> supplied GPFN has to at least pass VALID_M2P().
>
> In memory_exchange() go farther than merely adding checks: Restrict the
> scopes of the two variables such that it becomes more clear across which
> range of code the validity checks actually apply. Also don't limit
> checking there to non-translated domains (as of now steal_page() would
> prevent things from working on translated ones), to avoid giving bad
> examples or leaving latent traps.
>
> Furthermore, covering translated domains in memory_exchange() is forward-
> looking: Right now steal_page() prevents (successful) use of that sub-op
> by such domains, but there are intentions to relax that.
>
> Fixes: e4dfe0cdba5e ("Replace dom_mem_op hypercall with memory_op hypercall
> with")
> Fixes: 6f8668f57256 ("New memory hypercall 'populate_physmap'")
> Fixes: 516250dac6a8 ("New memory_op XENMEM_exchange")
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
OK, so to begin with, this commit message hardly tells me anything I
need to know. "At best undefined", ok, but is that a problem? "For
non-translated domains the same isn't true" -- sorry, does that mean
behavior is worse than "at best undefined", or better? "...and domains
may possibly be able to leverage present behavior" -- Is this
attackers leveraging the present behavior to do evil, or clever OS
writers leveraging the present behavior for good? "[I]n fact,
XENMEM_memory_exchange is known to be used in such ways" -- who's
using it in what ways? Are we talking about attacks in the wild, and
if so, why is this not an XSA? If not, who's using it how, and is
that a good thing or not? "Instead, the supplied GPFN has to at least
pass VALID_M2P()" -- this comes off as a non-sequitir, given that I
don't know what's going on.
I asked Claude to write an introduction to the commit for me, and it
wrote the following, which I found actually helped me understand what
you were trying to do here:
---
memory: check incoming GFNs
XENMEM_populate_physmap, XENMEM_decrease_reservation and XENMEM_exchange
each take a list of frame numbers, every one the first frame of an
extent of 2^extent_order pages. The public header describes each
extent as aligned to its size ("size/alignment of each (2^extent_order
pages)"), but Xen has never checked that.
For a translated domain the numbers are GFNs. An unaligned extent
works today because the paths that handle it split it up: the P2M code
of x86, Arm and RISC-V sizes each piece by alignment, and the PoD paths
have split such requests into aligned chunks since 182c737b9ba5
("x86/PoD: deal with misaligned GFNs"). The extent is then mapped in
pieces smaller than its size.
For a PV domain the numbers mean different things. The extents given
to XENMEM_decrease_reservation, and XENMEM_exchange's input extents, are
machine frames. The extents given to XENMEM_populate_physmap, and
XENMEM_exchange's output extents, are pseudo-physical frames, which Xen
uses only as the values it writes into the M2P, a page at a time, so
their alignment makes no difference to it. Guests rely on this: before
Linux 5.15, swiotlb-xen allocated its boot-time bounce buffer with page
alignment only, and then had XENMEM_exchange replace it with
machine-contiguous memory one 256k segment (order 6) at a time, so each
output extent was aligned only to a page. Nor are pseudo-physical frame
numbers checked in any other way: one with the top bit set, which in an
M2P entry means "no pseudo-physical frame" (INVALID_M2P_ENTRY,
SHARED_M2P_ENTRY), is written into the M2P as it comes.
Accepting input that the interface rules out leaves every P2M path to
cope with it, in today's code and in any added later; PoD did not cope
until the change above, which was part of XSA-388. And nothing stops a
PV guest from naming a pseudo-physical frame that cannot exist.
Check the numbers where they come in. Every extent must be aligned to
its order, except a PV domain's output extents in XENMEM_exchange, which
must keep accepting what older Linux passes. A PV domain's
pseudo-physical frame numbers must also pass VALID_M2P(), in
XENMEM_populate_physmap and in XENMEM_exchange's output. (A PV domain
gets its machine frames from Xen, which allocates an extent of a given
order aligned to that order.) An extent that fails a check ends the
request as other invalid extents do: XENMEM_populate_physmap and
XENMEM_decrease_reservation return the number of extents completed, and
XENMEM_exchange fails with -EDOM.
XENMEM_exchange's checks apply to translated domains too, although for
now steal_page() keeps them from using that sub-op, as there are plans
to relax that. In memory_exchange(), declare gmfn and gpfn inside the
loops that read them, which shows the code each check covers.
The one in-tree caller affected is the PV domain builder with vNUMA. It
asks for 2M extents from each node's start, so a node that doesn't start
on a 2M boundary is now populated with 4k extents. The guest still
builds.
---
OK, so the interface says there are restrictions, but we've never
checked them; and we've already had one XSA as a result. But older
versions of Linux specifically relies on some of the behavior; so add
restrictions where we can, making and documenting exceptions for
backwards compatibility for cases where it's already relied on.
You don't have to take Claude's message, but the message does need to
be made more clear; or at least accurate -- the code now requires
alignment for populate_physmap and decrease_reservation for all guest
types, but the commit message implies that only VALID_M2P is required
for PV guests.
Did you realize / intend the effect on vNUMA builds? This should be
in the commit message as well.
> ---
> I'm not sure at all whether for the direct-mapped case the checking in
> populate_physmap() is appropriate.
> ---
> v2: Drop the paging_mode_translate() part from the two GMFN checks.
> Tighten the GPFN check in populate_physmap(). Add ChangeLog entry.
>
> --- a/CHANGELOG.md
> +++ b/CHANGELOG.md
> @@ -9,6 +9,9 @@ The format is based on [Keep a Changelog
> ### Changed
> - XEN_DOMCTL_DEV_DT's, FLASK_[GS]ETBOOL's, and FLASK_DEVICETREE_LABEL's
> input
> string sizes need to include the nul terminator.
> + - XEMMEM_populate_physmap, XENMEM_decrease_reservation, and
> + XENMEM_memory_exchange now check input frame numbers more strictly (for
> + alignment according to the indicated order).
s/XENMEM_memory_exchange/XENMEM_exchange/;, and XENMEM_exchange isn't
checked for alignment.
>
> ### Added
>
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -40,6 +40,10 @@
> #include <asm/guest.h>
> #endif
>
> +#ifndef VALID_M2P
> +# define VALID_M2P(gpfn) ((gpfn) != INVALID_M2P_ENTRY)
> +#endif
So other architectures don't have an M2P at all, correct? And they're
all translated, so this never actually gets evaluated on those
architectures. (On arm32, this would be wrong anyway, as
INVALID_M2P_ENTRY is ~0UL, 32-bit; but xen_pfn_t is 64-bit. But
again, it's never used so it doesn't actually matter.)
Would it be more honest to have something like the following?
#ifdef VALID_M2P
# define M2P_CHECK(d, gpfn) (paging_mode_translate(d) || VALID_M2P(gpfn))
#else
# define M2P_CHECK(d, gpfn) true
#endif
Or alternately, to have a dummy `#define VALID_M2P(gpfn) true` in a
common header?
> +
> struct memop_args {
> /* INPUT */
> struct domain *domain; /* Domain to be affected. */
> @@ -277,6 +281,10 @@ static void populate_physmap(struct memo
> if ( unlikely(__copy_from_guest_offset(&gpfn, a->extent_list, i, 1))
> )
> goto out;
>
> + if ( !IS_ALIGNED(gpfn, 1UL << a->extent_order) ||
> + (!paging_mode_translate(d) && !VALID_M2P(gpfn)) )
> + goto out;
> +
> if ( a->memflags & MEMF_populate_on_demand )
> {
> /* Disallow populating PoD pages on oneself. */
> @@ -586,6 +594,9 @@ static void decrease_reservation(struct
> if ( unlikely(__copy_from_guest_offset(&gmfn, a->extent_list, i, 1))
> )
> goto out;
>
> + if ( !IS_ALIGNED(gmfn, 1UL << a->extent_order) )
> + goto out;
> +
> if ( tb_init_done )
> {
> struct {
> @@ -665,7 +676,6 @@ static long memory_exchange(XEN_GUEST_HA
> PAGE_LIST_HEAD(in_chunk_list);
> PAGE_LIST_HEAD(out_chunk_list);
> unsigned long in_chunk_order, out_chunk_order;
> - xen_pfn_t gpfn, gmfn;
> mfn_t mfn;
> unsigned long i, j, k;
> unsigned int memflags = 0;
> @@ -778,6 +788,8 @@ static long memory_exchange(XEN_GUEST_HA
> /* Steal a chunk's worth of input pages from the domain. */
> for ( j = 0; j < (1UL << in_chunk_order); j++ )
> {
> + xen_pfn_t gmfn;
> +
> if ( unlikely(__copy_from_guest_offset(
> &gmfn, exch.in.extent_start, (i<<in_chunk_order)+j, 1)) )
> {
> @@ -785,6 +797,12 @@ static long memory_exchange(XEN_GUEST_HA
> goto fail;
> }
>
> + if ( !IS_ALIGNED(gmfn, 1UL << exch.in.extent_order) )
> + {
> + rc = -EDOM;
> + goto fail;
> + }
> +
> for ( k = 0; k < (1UL << exch.in.extent_order); k++ )
> {
> #ifdef CONFIG_X86
> @@ -867,6 +885,8 @@ static long memory_exchange(XEN_GUEST_HA
> /* Assign each output page to the domain. */
> for ( j = 0; (page = page_list_remove_head(&out_chunk_list)); ++j )
> {
> + xen_pfn_t gpfn;
> +
> if ( assign_page(page, exch.out.extent_order, d,
> MEMF_no_refcount) )
> {
> @@ -903,6 +923,18 @@ static long memory_exchange(XEN_GUEST_HA
> continue;
> }
>
> + /*
> + * PV domains are known to pass arbitrary PFNs into this
> hypercall.
> + * Therefore we cannot apply the alignment check there.
> + */
Worth being explicit here, so that in 20 years' time, someone can
consider whether we can drop the exception?
> + if ( paging_mode_translate(d)
> + ? !IS_ALIGNED(gpfn, 1UL << exch.out.extent_order)
> + : !VALID_M2P(gpfn) )
> + {
> + rc = -EDOM;
> + continue;
> + }
Nit: Technically only the first gpfn is checked for validity; since
the extent isn't guaranteed to be aligned, the base gpfn could be
arranged such that the first one didn't have the high bit set, but
later ones did. Since this is mostly a sanity check, that's probably
fine.
Functionally speaking, the patch looks good.
-George
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |