libxl: Do not trust backend for nic in list

libxl_device_nic_list should use the /libxl path to search for
devices, and for obtaining the device information.

The "type" parameter was always "vif".  Abolish it.  (In any case,
paths in /libxl/device are named after the frontend type which is
constant, not the backend type which might in future vary.)

Abolish a redundant store to pnic->backend_domid.  Before this commit,
that store was not needed because libxl_device_nic_init (called by
libxl__device_nic_from_xenstore) would zero it.  Now it overwrites the
correct backend domid with zero; so remove it.

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:
Ian Jackson authored and Ian Jackson committed 2016-06-06 17:22:19 +01:00
1 parent 30f1276f1d
commit 08ea21f236
1 file changed
+7 -8
+7 -8
View File
@@ -3052,20 +3052,19 @@ out:
return rc;
}
static int libxl__append_nic_list_of_type(libxl__gc *gc,
static int libxl__append_nic_list(libxl__gc *gc,
uint32_t domid,
const char *type,
libxl_device_nic **nics,
int *nnics)
{
char *be_path = NULL;
char *libxl_dir_path = NULL;
char **dir = NULL;
unsigned int n = 0;
libxl_device_nic *pnic = NULL, *pnic_end = NULL;
be_path = libxl__sprintf(gc, "%s/backend/%s/%d",
libxl__xs_get_dompath(gc, 0), type, domid);
dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n);
libxl_dir_path = GCSPRINTF("%s/device/vif",
libxl__xs_libxl_path(gc, domid));
dir = libxl__xs_directory(gc, XBT_NULL, libxl_dir_path, &n);
if (dir && n) {
libxl_device_nic *tmp;
tmp = realloc(*nics, sizeof (libxl_device_nic) * (*nnics + n));
@@ -3077,7 +3076,7 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc,
pnic_end = *nics + *nnics;
for (; pnic < pnic_end; pnic++, dir++) {
const char *p;
p = libxl__sprintf(gc, "%s/%s", be_path, *dir);
p = libxl__sprintf(gc, "%s/%s", libxl_dir_path, *dir);
libxl__device_nic_from_xenstore(gc, p, pnic);
pnic->backend_domid = 0;
}
@@ -3093,7 +3092,7 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num
*num = 0;
rc = libxl__append_nic_list_of_type(gc, domid, "vif", &nics, num);
rc = libxl__append_nic_list(gc, domid, &nics, num);
if (rc) goto out_err;
GC_FREE;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.