From 125ac4c0a82161986d3c9496e2c62692d7f47e91 Mon Sep 17 00:00:00 2001 From: Julio Faracco Date: Fri, 28 Sep 2018 01:13:28 -0300 Subject: [PATCH] uml: umlConnectOpen: Check the driver pointer before accessing it The pointer related to uml_driver needs to be checked before its usage inside the function. Some attributes of the driver are being accessed while the pointer is NULL considering the current logic. Signed-off-by: Julio Faracco Reviewed-by: Erik Skultety --- src/uml/uml_driver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index fcd468243e..d1c71d8521 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1193,6 +1193,13 @@ static virDrvOpenStatus umlConnectOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + /* URI was good, but driver isn't active */ + if (uml_driver == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("uml state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } + /* Check path and tell them correct path if they made a mistake */ if (uml_driver->privileged) { if (STRNEQ(conn->uri->path, "/system") && @@ -1211,13 +1218,6 @@ static virDrvOpenStatus umlConnectOpen(virConnectPtr conn, } } - /* URI was good, but driver isn't active */ - if (uml_driver == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("uml state driver is not active")); - return VIR_DRV_OPEN_ERROR; - } - if (virConnectOpenEnsureACL(conn) < 0) return VIR_DRV_OPEN_ERROR;