|
|
c3a4ccc |
From 5399ab94a9224b4a826fd5c6a1b8b258292d1efd Mon Sep 17 00:00:00 2001
|
|
|
c3a4ccc |
From: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
|
c3a4ccc |
Date: Fri, 29 Apr 2016 19:13:17 +0100
|
|
|
c3a4ccc |
Subject: [PATCH 09/21] libxl: Do not trust backend for cdrom insert
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
Use the /libxl path where appropriate. Rename `path' variable to
|
|
|
c3a4ccc |
`be_path' to make sure we caught all the occurrences.
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
Specifically, when checking that the device still exists, check the
|
|
|
c3a4ccc |
`frontend' value in /libxl, rather than anything in the backend
|
|
|
c3a4ccc |
directory.
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
This is part of XSA-178.
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
|
|
|
c3a4ccc |
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
|
|
|
c3a4ccc |
---
|
|
|
c3a4ccc |
tools/libxl/libxl.c | 20 ++++++++++----------
|
|
|
c3a4ccc |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
|
|
|
c3a4ccc |
index 2d2b077..ded2040 100644
|
|
|
c3a4ccc |
--- a/tools/libxl/libxl.c
|
|
|
c3a4ccc |
+++ b/tools/libxl/libxl.c
|
|
|
c3a4ccc |
@@ -2900,7 +2900,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
|
|
|
c3a4ccc |
libxl_domain_config d_config;
|
|
|
c3a4ccc |
int rc, dm_ver;
|
|
|
c3a4ccc |
libxl__device device;
|
|
|
c3a4ccc |
- const char *path, *libxl_path;
|
|
|
c3a4ccc |
+ const char *be_path, *libxl_path;
|
|
|
c3a4ccc |
char * tmp;
|
|
|
c3a4ccc |
libxl__domain_userdata_lock *lock = NULL;
|
|
|
c3a4ccc |
xs_transaction_t t = XBT_NULL;
|
|
|
c3a4ccc |
@@ -2973,7 +2973,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
|
|
|
c3a4ccc |
rc = libxl__device_from_disk(gc, domid, disk, &device);
|
|
|
c3a4ccc |
if (rc) goto out;
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
- path = libxl__device_backend_path(gc, &device);
|
|
|
c3a4ccc |
+ be_path = libxl__device_backend_path(gc, &device);
|
|
|
c3a4ccc |
libxl_path = libxl__device_libxl_path(gc, &device);
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
insert = flexarray_make(gc, 4, 1);
|
|
|
c3a4ccc |
@@ -3013,19 +3013,19 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
|
|
|
c3a4ccc |
for (;;) {
|
|
|
c3a4ccc |
rc = libxl__xs_transaction_start(gc, &t);
|
|
|
c3a4ccc |
if (rc) goto out;
|
|
|
c3a4ccc |
- /* Sanity check: make sure the backend exists before writing here */
|
|
|
c3a4ccc |
- tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", path));
|
|
|
c3a4ccc |
+ /* Sanity check: make sure the device exists before writing here */
|
|
|
c3a4ccc |
+ tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", libxl_path));
|
|
|
c3a4ccc |
if (!tmp)
|
|
|
c3a4ccc |
{
|
|
|
c3a4ccc |
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist",
|
|
|
c3a4ccc |
- libxl__sprintf(gc, "%s/frontend", path));
|
|
|
c3a4ccc |
+ libxl__sprintf(gc, "%s/frontend", libxl_path));
|
|
|
c3a4ccc |
rc = ERROR_FAIL;
|
|
|
c3a4ccc |
goto out;
|
|
|
c3a4ccc |
}
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
char **kvs = libxl__xs_kvs_of_flexarray(gc, empty, empty->count);
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
- rc = libxl__xs_writev(gc, t, path, kvs);
|
|
|
c3a4ccc |
+ rc = libxl__xs_writev(gc, t, be_path, kvs);
|
|
|
c3a4ccc |
if (rc) goto out;
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
rc = libxl__xs_writev(gc, t, libxl_path, kvs);
|
|
|
c3a4ccc |
@@ -3052,12 +3052,12 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
|
|
|
c3a4ccc |
for (;;) {
|
|
|
c3a4ccc |
rc = libxl__xs_transaction_start(gc, &t);
|
|
|
c3a4ccc |
if (rc) goto out;
|
|
|
c3a4ccc |
- /* Sanity check: make sure the backend exists before writing here */
|
|
|
c3a4ccc |
- tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", path));
|
|
|
c3a4ccc |
+ /* Sanity check: make sure the device exists before writing here */
|
|
|
c3a4ccc |
+ tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", libxl_path));
|
|
|
c3a4ccc |
if (!tmp)
|
|
|
c3a4ccc |
{
|
|
|
c3a4ccc |
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist",
|
|
|
c3a4ccc |
- libxl__sprintf(gc, "%s/frontend", path));
|
|
|
c3a4ccc |
+ libxl__sprintf(gc, "%s/frontend", libxl_path));
|
|
|
c3a4ccc |
rc = ERROR_FAIL;
|
|
|
c3a4ccc |
goto out;
|
|
|
c3a4ccc |
}
|
|
|
c3a4ccc |
@@ -3067,7 +3067,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
char **kvs = libxl__xs_kvs_of_flexarray(gc, insert, insert->count);
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
- rc = libxl__xs_writev(gc, t, path, kvs);
|
|
|
c3a4ccc |
+ rc = libxl__xs_writev(gc, t, be_path, kvs);
|
|
|
c3a4ccc |
if (rc) goto out;
|
|
|
c3a4ccc |
|
|
|
c3a4ccc |
rc = libxl__xs_writev(gc, t, libxl_path, kvs);
|
|
|
c3a4ccc |
--
|
|
|
c3a4ccc |
2.1.4
|
|
|
c3a4ccc |
|