From 69f618db0f3c4b31e2da51793a60e53a7e6706e1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 May 2016 16:59:38 +0100 Subject: [PATCH 17/21] libxl: Do not trust backend in channel list Read the name from /libxl/device. Pass the /libxl path to libxl__device_channel_from_xenstore. This removes the final route by which READ_LIBXLDEV might receive a backend path. This is part of XSA-178. Signed-off-by: Ian Jackson Reviewed-by: Wei Liu --- v2: Remove be_path variable which is now no longer used. --- tools/libxl/libxl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index daa3417..bfd1ff7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3958,7 +3958,7 @@ static int libxl__append_channel_list(libxl__gc *gc, libxl_device_channel **channels, int *nchannels) { - char *libxl_dir_path = NULL, *be_path = NULL; + char *libxl_dir_path = NULL; char **dir = NULL; unsigned int n = 0, devid = 0; libxl_device_channel *next = NULL; @@ -3975,10 +3975,7 @@ static int libxl__append_channel_list(libxl__gc *gc, libxl_device_channel *tmp; libxl_path = GCSPRINTF("%s/%s", libxl_dir_path, dir[i]); - be_path = libxl__xs_read(gc, XBT_NULL, - GCSPRINTF("%s/backend", libxl_path)); - if (!be_path) continue; - name = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/name", be_path)); + name = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/name", libxl_path)); /* 'channels' are consoles with names, so ignore all consoles without names */ if (!name) continue; @@ -3990,7 +3987,7 @@ static int libxl__append_channel_list(libxl__gc *gc, } *channels = tmp; next = *channels + *nchannels + devid; - rc = libxl__device_channel_from_xenstore(gc, be_path, next); + rc = libxl__device_channel_from_xenstore(gc, libxl_path, next); if (rc) goto out; next->devid = devid; devid++; -- 2.1.4