* [PATCH v2] libxl: fix printing hotplug arguments/environment
@ 2016-08-02 10:49 Roger Pau Monne
2016-08-02 10:51 ` Wei Liu
0 siblings, 1 reply; 2+ messages in thread
From: Roger Pau Monne @ 2016-08-02 10:49 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Wei Liu, Roger Pau Monne
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.pau@citrix.com>
---
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Jackson <ian.jackson@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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] libxl: fix printing hotplug arguments/environment
2016-08-02 10:49 [PATCH v2] libxl: fix printing hotplug arguments/environment Roger Pau Monne
@ 2016-08-02 10:51 ` Wei Liu
0 siblings, 0 replies; 2+ messages in thread
From: Wei Liu @ 2016-08-02 10:51 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Wei Liu, Ian Jackson
On Tue, Aug 02, 2016 at 12:49:51PM +0200, Roger Pau Monne wrote:
> 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.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Cc: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Jackson <ian.jackson@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-02 10:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-02 10:49 [PATCH v2] libxl: fix printing hotplug arguments/environment Roger Pau Monne
2016-08-02 10:51 ` Wei Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).