From: Paul Durrant Subject: [PATCH v5 3/3] x86/hvm: Use white-lists for HVM param guest accessibility checks Date: Wed, 6 May 2015 13:58:07 +0100 Message-ID: <1430917087-11081-4-git-send-email-paul.durrant@citrix.com> References: <1430917087-11081-1-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1430917087-11081-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Andrew Cooper , Paul Durrant , Keir Fraser , Jan Beulich List-Id: xen-devel@lists.xenproject.org There are actually very few HVM parameters that a guest needs to read and even fewer that a guest needs to write. Use white-lists to specify those parameters and also ensre that, by default, newly introduced parameters are not accessible. Signed-off-by: Paul Durrant Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6be1c7f..371fd33 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5627,6 +5627,12 @@ static int hvm_allow_set_param(struct domain *d, switch ( a->index ) { + /* The following parameters can be set by the guest. */ + case HVM_PARAM_CALLBACK_IRQ: + case HVM_PARAM_VM86_TSS: + case HVM_PARAM_ACPI_IOPORTS_LOCATION: + case HVM_PARAM_VM_GENERATION_ID_ADDR: + break; /* * The following parameters must not be set by the guest * since the domain may need to be paused. @@ -5634,15 +5640,11 @@ static int hvm_allow_set_param(struct domain *d, case HVM_PARAM_IDENT_PT: case HVM_PARAM_DM_DOMAIN: case HVM_PARAM_ACPI_S_STATE: - /* The following parameters should not be set by the guest. */ - case HVM_PARAM_VIRIDIAN: - case HVM_PARAM_IOREQ_SERVER_PFN: - case HVM_PARAM_NR_IOREQ_SERVER_PAGES: + /* The remaining parameters should not be set by the guest. */ + default: if ( d == current->domain ) rc = -EPERM; break; - default: - break; } if ( rc ) @@ -5835,6 +5837,16 @@ static int hvm_allow_get_param(struct domain *d, switch ( a->index ) { + /* The following parameters can be read by the guest. */ + case HVM_PARAM_CALLBACK_IRQ: + case HVM_PARAM_VM86_TSS: + case HVM_PARAM_ACPI_IOPORTS_LOCATION: + case HVM_PARAM_VM_GENERATION_ID_ADDR: + case HVM_PARAM_STORE_PFN: + case HVM_PARAM_STORE_EVTCHN: + case HVM_PARAM_CONSOLE_PFN: + case HVM_PARAM_CONSOLE_EVTCHN: + break; /* * The following parameters must not be read by the guest * since the domain may need to be paused. @@ -5842,14 +5854,11 @@ static int hvm_allow_get_param(struct domain *d, case HVM_PARAM_IOREQ_PFN: case HVM_PARAM_BUFIOREQ_PFN: case HVM_PARAM_BUFIOREQ_EVTCHN: - /* The following parameters should not be read by the guest. */ - case HVM_PARAM_IOREQ_SERVER_PFN: - case HVM_PARAM_NR_IOREQ_SERVER_PAGES: + /* The remaining parameters should not be read by the guest. */ + default: if ( d == current->domain ) rc = -EPERM; break; - default: - break; } return rc; -- 1.7.10.4