mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
fix DOMID_IO mapping permission checks
When the permission checks for memory mapping were moved from get_pg_owner to xsm_mmu_update inaaba7a677, the exception for DOMID_IO was not taken into account. This will cause IO memory mappings by PV domains (mini-os in particular) to fail when XSM/FLASK is not being used. This patch reintroduces the exception for DOMID_IO; the actual restrictions on IO memory mappings have always been checked separately using iomem_access_permitted, so this change should not break existing access control. Reported-by: Eduardo Peixoto Macedo <epm@cin.ufpe.br> Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> master commit:07344c0f33master date: 2013-09-26 10:15:47 +0200
This commit is contained in:
1 parent
7b17418d1a
commit
9119a3fda3
1 file changed
+3
-2
@@ -567,9 +567,10 @@ static XSM_INLINE int xsm_domain_memory_map(XSM_DEFAULT_ARG struct domain *d)
|
||||
static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct domain *t,
|
||||
struct domain *f, uint32_t flags)
|
||||
{
|
||||
int rc;
|
||||
int rc = 0;
|
||||
XSM_ASSERT_ACTION(XSM_TARGET);
|
||||
rc = xsm_default_action(action, d, f);
|
||||
if ( f != dom_io )
|
||||
rc = xsm_default_action(action, d, f);
|
||||
if ( t && !rc )
|
||||
rc = xsm_default_action(action, d, t);
|
||||
return rc;
|
||||
|
||||