From 8e37e743331110b4fec5928689d74dceda5eb608 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 3 May 2016 15:40:18 +0100 Subject: [PATCH 13/21] libxl: Have READ_LIBXLDEV use libxl_path rather than be_path Fix the just-introduced bug in this macro: now it reads the trustworthy libxl_path. Change the variable name in the two functions (nic and channel) which use it. Shuffling the bump in the carpet along, we now introduce three new bugs: the three call sites pass a backend path where a frontend path is expected. No functional change. This is part of XSA-178. Signed-off-by: Ian Jackson Reviewed-by: Wei Liu --- tools/libxl/libxl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b5578cb..d7d7775 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -21,10 +21,10 @@ #define PAGE_TO_MEMKB(pages) ((pages) * 4) #define BACKEND_STRING_SIZE 5 -/* Utility to read /libxl or backend xenstore keys, from be_path */ +/* Utility to read /libxl xenstore keys, from libxl_path */ #define READ_LIBXLDEV(tgc, subpath) ({ \ rc = libxl__xs_read_checked(tgc, XBT_NULL, \ - GCSPRINTF("%s/" subpath, be_path), \ + GCSPRINTF("%s/" subpath, libxl_path), \ &tmp); \ if (rc) goto out; \ (char*)tmp; \ @@ -3586,7 +3586,7 @@ out: } static int libxl__device_nic_from_xenstore(libxl__gc *gc, - const char *be_path, + const char *libxl_path, libxl_device_nic *nic) { const char *tmp; @@ -3935,7 +3935,7 @@ int libxl__init_console_from_channel(libxl__gc *gc, } static int libxl__device_channel_from_xenstore(libxl__gc *gc, - const char *be_path, + const char *libxl_path, libxl_device_channel *channel) { const char *tmp; -- 2.1.4