From 6a34e67c118408ebdd62bfa7be76598ca040f170 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 14 Oct 2020 14:03:38 +0200 Subject: [PATCH] x86: fix resource leaks on arch_vcpu_create() error path {hvm,pv}_vcpu_initialise() have always kind of been meant to be the final possible source of errors in arch_vcpu_create(), hence not requiring any unrolling of what they've done on the error path. (Of course this may change once the various involved paths all have become idempotent.) But even beyond this aspect I think it is more logical to do policy initialization ahead of the calling of these two functions, as they may in principle want to access it. Fixes: 4187f79dc718 ("x86/msr: introduce struct msr_vcpu_policy") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5454f94d18..1b894d0124 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -569,6 +569,9 @@ int arch_vcpu_create(struct vcpu *v) vmce_init_vcpu(v); arch_vcpu_regs_init(v); + + if ( (rc = init_vcpu_msr_policy(v)) ) + goto fail; } else if ( (rc = xstate_alloc_save_area(v)) != 0 ) return rc; @@ -594,9 +597,6 @@ int arch_vcpu_create(struct vcpu *v) { vpmu_initialise(v); - if ( (rc = init_vcpu_msr_policy(v)) ) - goto fail; - cpuid_policy_updated(v); } -- 2.39.5