An OS could decide to not pass any environment variables to hotplug scripts,
and this will trigger a bug in device_hotplug logic, since it expects the
environment array to exist. Allow env to be NULL.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
Cc: Wei Liu <wei.l...@citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
---
Changes since v1:
- Fix commit message
- Only allow env to be NULL.
---
tools/libxl/libxl_device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index b9a6df2..dbf157d 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -1130,6 +1130,7 @@ static void device_hotplug(libxl__egc *egc,
libxl__ao_device *aodev)
goto out;
}
+ assert(args != NULL);
LOG(DEBUG, "calling hotplug script: %s %s", args[0], args[1]);
LOG(DEBUG, "extra args:");
{
@@ -1140,7 +1141,7 @@ static void device_hotplug(libxl__egc *egc,
libxl__ao_device *aodev)
LOG(DEBUG, "\t%s", arg);
}
LOG(DEBUG, "env:");
- {
+ if (env != NULL) {
const char *k, *v;
unsigned int x;
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
