mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
libxl: Do not trust frontend for nic in getinfo
libxl_device_nic_getinfo needs to examine devices without trusting frontend-controlled data. So: * Use /libxl to find the backend path. * Parse the backend path to find the backend domid, rather than reading it from the frontend. This is part of XSA-175. 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
7e03b128e0
commit
eaccadee01
1 file changed
+12
-5
+12
-5
@@ -3718,21 +3718,26 @@ int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
|
||||
libxl_device_nic *nic, libxl_nicinfo *nicinfo)
|
||||
{
|
||||
GC_INIT(ctx);
|
||||
char *dompath, *nicpath;
|
||||
char *dompath, *nicpath, *libxl_path;
|
||||
char *val;
|
||||
int rc;
|
||||
|
||||
dompath = libxl__xs_get_dompath(gc, domid);
|
||||
nicinfo->devid = nic->devid;
|
||||
|
||||
nicpath = GCSPRINTF("%s/device/vif/%d", dompath, nicinfo->devid);
|
||||
libxl_path = GCSPRINTF("%s/device/vif/%d",
|
||||
libxl__xs_libxl_path(gc, domid), nicinfo->devid);
|
||||
nicinfo->backend = xs_read(ctx->xsh, XBT_NULL,
|
||||
GCSPRINTF("%s/backend", nicpath), NULL);
|
||||
GCSPRINTF("%s/backend", libxl_path), NULL);
|
||||
if (!nicinfo->backend) {
|
||||
GC_FREE;
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
val = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/backend-id", nicpath));
|
||||
nicinfo->backend_id = val ? strtoul(val, NULL, 10) : -1;
|
||||
rc = libxl__backendpath_parse_domid(gc, nicinfo->backend,
|
||||
&nicinfo->backend_id);
|
||||
if (rc) goto out;
|
||||
|
||||
val = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/state", nicpath));
|
||||
nicinfo->state = val ? strtoul(val, NULL, 10) : -1;
|
||||
val = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/event-channel", nicpath));
|
||||
@@ -3746,8 +3751,10 @@ int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
|
||||
val = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/frontend-id", nicinfo->backend));
|
||||
nicinfo->frontend_id = val ? strtoul(val, NULL, 10) : -1;
|
||||
|
||||
rc = 0;
|
||||
out:
|
||||
GC_FREE;
|
||||
return 0;
|
||||
return rc;
|
||||
}
|
||||
|
||||
const char *libxl__device_nic_devname(libxl__gc *gc,
|
||||
|
||||