From 7e42cb64bcf6cdfe679c04fede8fb6f45cf75a84 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 3 May 2016 15:40:18 +0100 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ed7687b279..0bf1c5bc95 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3031,7 +3031,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; @@ -3041,7 +3041,7 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc, #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; \ -- 2.39.5