From 8f1d6c049c0439d8c5b175a0f8369cfde57ba08c Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Tue, 12 Nov 2019 14:19:43 +0000 Subject: [PATCH] libxl: Fix libxl_retrieve_domain_configuration error path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If an error were to happen before the last step, for example the domain_configuration is missing, the error wouldn't be checked by the _end callback. Fix that, also initialise `lock' to NULL because the exit path checks it. The issue shows up when there's a stubdom, and running `xl list -l` aborts. Instead, with this patch, `xl list -l` will not list stubdom, probably like before. Reported-by: Marek Marczykowski-Górecki Fixes: 61563419257ed40278938db2cce7d697aed44f5d Signed-off-by: Anthony PERARD Tested-by: Marek Marczykowski-Górecki Acked-by: Wei Liu Release-acked-by: Juergen Gross --- tools/libxl/libxl_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c index 9d0eb5aed1..33f9d9eaa4 100644 --- a/tools/libxl/libxl_domain.c +++ b/tools/libxl/libxl_domain.c @@ -1998,12 +1998,14 @@ static void retrieve_domain_configuration_end(libxl__egc *egc, retrieve_domain_configuration_state *rdcs, int rc) { STATE_AO_GC(rdcs->qmp.ao); - libxl__domain_userdata_lock *lock; + libxl__domain_userdata_lock *lock = NULL; /* Convenience aliases */ libxl_domain_config *const d_config = rdcs->d_config; libxl_domid domid = rdcs->qmp.domid; + if (rc) goto out; + lock = libxl__lock_domain_userdata(gc, domid); if (!lock) { rc = ERROR_LOCK_FAIL; -- 2.30.2