Previously this was done ad-hoc in admin_io_okay.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
Cc: Jan Beulich <jbeul...@suse.com>
Cc: Andrew Cooper <andrew.coop...@citrix.com>
---
xen/arch/x86/domain_build.c | 3 +++
xen/arch/x86/traps.c | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 03e4bfe..2a23746 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -37,6 +37,7 @@
#include <asm/io_apic.h>
#include <asm/hap.h>
#include <asm/hpet.h>
+#include <asm/mc146818rtc.h>
#include <public/version.h>
@@ -1548,6 +1549,8 @@ int __init construct_dom0(
rc |= ioports_deny_access(d, pmtmr_ioport, pmtmr_ioport + 3);
/* PCI configuration space (NB. 0xcf8 has special treatment). */
rc |= ioports_deny_access(d, 0xcfc, 0xcff);
+ /* Never permit direct access to the RTC/CMOS registers. */
+ rc |= ioports_deny_access(d, RTC_PORT(0), RTC_PORT(1));
/* Command-line I/O ranges. */
process_dom0_ioports_disable(d);
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 22cdfc4..0b0c5e9 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1765,10 +1765,6 @@ static int admin_io_okay(
if ( (port == 0xcf8) && (bytes == 4) )
return 0;
- /* We also never permit direct access to the RTC/CMOS registers. */
- if ( ((port & ~1) == RTC_PORT(0)) )
- return 0;
-
return ioports_access_permitted(v->domain, port, port + bytes - 1);
}
--
1.9.5 (Apple Git-50.3)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
