49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 0e95f7b912055cf254b71b0b02dcb0acf7da3870 Mon Sep 17 00:00:00 2001
|
|
From: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Fri, 3 Apr 2020 15:51:48 -0600
|
|
Subject: [PATCH 1/8] libxl: fix crash when initializing driver
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 54a401af478 split out DriverConfigInit from DriverConfigNew, but
|
|
then called it a bit late from libxlStateInitialize. The cfg is used in
|
|
libxlDriverConfigLoadFile and when uninitialized results in a crash.
|
|
Calling DriverConfigInit immediately after DriverConfigNew fixes the
|
|
crash.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry-picked from commit 88011ed2)
|
|
Signed-off-by: AlexChen <alex.chen@huawei.com>
|
|
---
|
|
src/libxl/libxl_driver.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
|
|
index 7ec4fcc3d1..980984b199 100644
|
|
--- a/src/libxl/libxl_driver.c
|
|
+++ b/src/libxl/libxl_driver.c
|
|
@@ -702,14 +702,14 @@ libxlStateInitialize(bool privileged,
|
|
if (!(cfg = libxlDriverConfigNew()))
|
|
goto error;
|
|
|
|
+ if (libxlDriverConfigInit(cfg) < 0)
|
|
+ goto error;
|
|
+
|
|
driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir);
|
|
|
|
if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
|
|
goto error;
|
|
|
|
- if (libxlDriverConfigInit(cfg) < 0)
|
|
- goto error;
|
|
-
|
|
/* Register the callbacks providing access to libvirt's event loop */
|
|
libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
|
|
|
|
--
|
|
2.23.0
|
|
|