diff options
| author | Daniel De Graaf <dgdegra@tycho.nsa.gov> | 2013-09-25 10:48:20 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-09-25 10:48:20 +0200 |
| commit | 145ae98bfab8280744ad5e800cc036e1c84c0486 (patch) | |
| tree | fcc0ac34eb7322f578a9e257b5c009c106730a7d /xen | |
| parent | ae7c6b64c063a755097806e30dc24b94fabbda09 (diff) | |
| download | xen-145ae98bfab8280744ad5e800cc036e1c84c0486.tar.gz xen-145ae98bfab8280744ad5e800cc036e1c84c0486.tar.bz2 xen-145ae98bfab8280744ad5e800cc036e1c84c0486.zip | |
fix DOMID_IO mapping permission checks
When the permission checks for memory mapping were moved from
get_pg_owner to xsm_mmu_update in aaba7a677, 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>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/include/xsm/dummy.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index cc0a5a8301..f831bc4171 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -570,6 +570,8 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do int rc; XSM_ASSERT_ACTION(XSM_TARGET); rc = xsm_default_action(action, d, f); + if ( t == dom_io ) + return rc; if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; |