Skip to content

Commit

Permalink
xen: Check the alignment of the offset pased via VCPUOP_register_vcpu…
Browse files Browse the repository at this point in the history
…_info

Currently a guest is able to register any guest physical address to use
for the vcpu_info structure as long as the structure can fits in the
rest of the frame.

This means a guest can provide an address that is not aligned to the
natural alignment of the structure.

On Arm 32-bit, unaligned access are completely forbidden by the
hypervisor. This will result to a data abort which is fatal.

On Arm 64-bit, unaligned access are only forbidden when used for atomic
access. As the structure contains fields (such as evtchn_pending_self)
that are updated using atomic operations, any unaligned access will be
fatal as well.

While the misalignment is only fatal on Arm, a generic check is added
as an x86 guest shouldn't sensibly pass an unaligned address (this
would result to a split lock).

This is XSA-327.

Reported-by: Julien Grall <jgrall@amazon.com>
Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
  • Loading branch information
Julien Grall authored and jbeulich committed Jul 7, 2020
1 parent c23274f commit 3fdc211
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions xen/common/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -1227,10 +1227,20 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset)
void *mapping;
vcpu_info_t *new_info;
struct page_info *page;
unsigned int align;

if ( offset > (PAGE_SIZE - sizeof(vcpu_info_t)) )
return -EINVAL;

#ifdef CONFIG_COMPAT
if ( has_32bit_shinfo(d) )
align = alignof(new_info->compat);
else
#endif
align = alignof(*new_info);
if ( offset & (align - 1) )
return -EINVAL;

if ( !mfn_eq(v->vcpu_info_mfn, INVALID_MFN) )
return -EINVAL;

Expand Down

0 comments on commit 3fdc211

Please sign in to comment.