mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
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 <ian.jackson@eu.citrix.com> Reviewed-by: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
1 parent
b8cd687aeb
commit
2eab07f665
1 file changed
+4
-4
+4
-4
@@ -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; \
|
||||
@@ -3471,7 +3471,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;
|
||||
@@ -3819,7 +3819,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;
|
||||
|
||||