]> xenbits.xensource.com Git - xen.git/commitdiff
sched: fix sched_move_domain() for domain without vcpus
authorJuergen Gross <jgross@suse.com>
Wed, 15 Sep 2021 08:57:47 +0000 (10:57 +0200)
committerJan Beulich <jbeulich@suse.com>
Wed, 15 Sep 2021 08:57:47 +0000 (10:57 +0200)
In case a domain is created with a cpupool other than Pool-0 specified
it will be moved to that cpupool before any vcpus are allocated.

This will lead to a NULL pointer dereference in sched_move_domain().

Fix that by tolerating vcpus not being allocated yet.

Fixes: 70fadc41635b9b6 ("xen/cpupool: support moving domain between cpupools with different granularity")
Reported-by: Bertrand Marquis <bertrand.marquis@arm.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Dario Faggioli <dfaggioli@suse.com>
xen/common/sched/core.c

index 8d178baf3da4d7fd409674b7ff387bed05831ea4..8f4b1ca10d1c14a7f413fddfc76865375298bebf 100644 (file)
@@ -651,7 +651,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c)
     struct scheduler *old_ops = dom_scheduler(d);
     void *old_domdata;
     unsigned int gran = cpupool_get_granularity(c);
-    unsigned int n_units = DIV_ROUND_UP(d->max_vcpus, gran);
+    unsigned int n_units = d->vcpu[0] ? DIV_ROUND_UP(d->max_vcpus, gran) : 0;
     int ret = 0;
 
     for_each_vcpu ( d, v )