From: Juergen Gross Date: Wed, 15 Sep 2021 08:57:47 +0000 (+0200) Subject: sched: fix sched_move_domain() for domain without vcpus X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~196 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=999e1582f289cfb8d59e2e58927c1cba0ac2ada3;p=xen.git sched: fix sched_move_domain() for domain without vcpus 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 Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli --- diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 8d178baf3d..8f4b1ca10d 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -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 )