[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen stable-4.5] libxl: Do not trust backend for nic in list
commit 1a75ae14d0e6b2969dc3b09f4f5963cd09a8118a Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> AuthorDate: Wed May 4 16:23:57 2016 +0100 Commit: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> CommitDate: Mon Jun 6 15:48:36 2016 +0100 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@xxxxxxxxxxxxx> Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- tools/libxl/libxl.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0f87ad7..9aebc9e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3566,21 +3566,20 @@ 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; int rc; - 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)); @@ -3591,10 +3590,9 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc, pnic_end = *nics + *nnics + n; for (; pnic < pnic_end; pnic++, dir++) { const char *p; - p = libxl__sprintf(gc, "%s/%s", be_path, *dir); + p = GCSPRINTF("%s/%s", libxl_dir_path, *dir); rc = libxl__device_nic_from_xenstore(gc, p, pnic); if (rc) goto out; - pnic->backend_domid = 0; } *nnics += n; } @@ -3612,7 +3610,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; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |