mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
domctl/XSM: drop shadow_control_op hook
Integrate the checking with xsm_domctl(), now that it has the full op
struct passed. As a positive side effect, permissions are then checked at
the same early point with and without Flask.
This is part of XSA-492.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Daniel P. Smith <dpsmith@apertussolutions.com>
(cherry picked from commit d9d2758622)
This commit is contained in:
Jan Beulich authored and Andrew Cooper committed
1 parent
b48039e907
commit
82887f1d25
5 files changed
+7
-25
No files matched your search
@@ -677,10 +677,6 @@ int paging_domctl(struct domain *d, struct xen_domctl_shadow_op *sc,
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
rc = xsm_shadow_control(XSM_HOOK, d, sc->op);
|
||||
if ( rc )
|
||||
return rc;
|
||||
|
||||
/* Code to handle log-dirty. Note that some log dirty operations
|
||||
* piggy-back on shadow operations. For example, when
|
||||
* XEN_DOMCTL_SHADOW_OP_OFF is called, it first checks whether log dirty
|
||||
|
||||
@@ -682,13 +682,6 @@ static XSM_INLINE int cf_check xsm_do_mca(XSM_DEFAULT_VOID)
|
||||
return xsm_default_action(action, current->domain, NULL);
|
||||
}
|
||||
|
||||
static XSM_INLINE int cf_check xsm_shadow_control(
|
||||
XSM_DEFAULT_ARG struct domain *d, uint32_t op)
|
||||
{
|
||||
XSM_ASSERT_ACTION(XSM_HOOK);
|
||||
return xsm_default_action(action, current->domain, d);
|
||||
}
|
||||
|
||||
static XSM_INLINE int cf_check xsm_mem_sharing_op(
|
||||
XSM_DEFAULT_ARG struct domain *d, struct domain *cd, int op)
|
||||
{
|
||||
|
||||
@@ -172,7 +172,6 @@ struct xsm_ops {
|
||||
|
||||
#ifdef CONFIG_X86
|
||||
int (*do_mca)(void);
|
||||
int (*shadow_control)(struct domain *d, uint32_t op);
|
||||
int (*mem_sharing_op)(struct domain *d, struct domain *cd, int op);
|
||||
int (*apic)(struct domain *d, int cmd);
|
||||
int (*machine_memory_map)(void);
|
||||
@@ -680,12 +679,6 @@ static inline int xsm_do_mca(xsm_default_t def)
|
||||
return alternative_call(xsm_ops.do_mca);
|
||||
}
|
||||
|
||||
static inline int xsm_shadow_control(
|
||||
xsm_default_t def, struct domain *d, uint32_t op)
|
||||
{
|
||||
return alternative_call(xsm_ops.shadow_control, d, op);
|
||||
}
|
||||
|
||||
static inline int xsm_mem_sharing_op(
|
||||
xsm_default_t def, struct domain *d, struct domain *cd, int op)
|
||||
{
|
||||
|
||||
@@ -130,7 +130,6 @@ static const struct xsm_ops __initconst_cf_clobber dummy_ops = {
|
||||
.platform_op = xsm_platform_op,
|
||||
#ifdef CONFIG_X86
|
||||
.do_mca = xsm_do_mca,
|
||||
.shadow_control = xsm_shadow_control,
|
||||
.mem_sharing_op = xsm_mem_sharing_op,
|
||||
.apic = xsm_apic,
|
||||
.machine_memory_map = xsm_machine_memory_map,
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
|
||||
#ifdef CONFIG_X86
|
||||
#include <asm/pv/shim.h>
|
||||
static int flask_shadow_control(struct domain *d, unsigned int op);
|
||||
#else
|
||||
#define pv_shim false
|
||||
#endif
|
||||
@@ -699,10 +700,6 @@ static int cf_check flask_domctl(struct domain *d, struct xen_domctl *op)
|
||||
/* These have individual XSM hooks (common/domctl.c) */
|
||||
case XEN_DOMCTL_set_target:
|
||||
|
||||
#ifdef CONFIG_X86
|
||||
/* These have individual XSM hooks (arch/x86/domctl.c) */
|
||||
case XEN_DOMCTL_shadow_op:
|
||||
#endif
|
||||
#ifdef CONFIG_HAS_PASSTHROUGH
|
||||
/*
|
||||
* These have individual XSM hooks
|
||||
@@ -787,6 +784,11 @@ static int cf_check flask_domctl(struct domain *d, struct xen_domctl *op)
|
||||
case XEN_DOMCTL_get_address_size:
|
||||
return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__GETADDRSIZE);
|
||||
|
||||
#ifdef CONFIG_X86
|
||||
case XEN_DOMCTL_shadow_op:
|
||||
return flask_shadow_control(d, op->u.shadow_op.op);
|
||||
#endif
|
||||
|
||||
case XEN_DOMCTL_mem_sharing_op:
|
||||
return current_has_perm(d, SECCLASS_HVM, HVM__MEM_SHARING);
|
||||
|
||||
@@ -1603,7 +1605,7 @@ static int cf_check flask_do_mca(void)
|
||||
return domain_has_xen(current->domain, XEN__MCA_OP);
|
||||
}
|
||||
|
||||
static int cf_check flask_shadow_control(struct domain *d, uint32_t op)
|
||||
static int flask_shadow_control(struct domain *d, unsigned int op)
|
||||
{
|
||||
uint32_t perm;
|
||||
|
||||
@@ -1999,7 +2001,6 @@ static const struct xsm_ops __initconst_cf_clobber flask_ops = {
|
||||
.platform_op = flask_platform_op,
|
||||
#ifdef CONFIG_X86
|
||||
.do_mca = flask_do_mca,
|
||||
.shadow_control = flask_shadow_control,
|
||||
.mem_sharing_op = flask_mem_sharing_op,
|
||||
.apic = flask_apic,
|
||||
.machine_memory_map = flask_machine_memory_map,
|
||||
|
||||