1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From 98d7429a69e58b0cd58451b631ecfa4943feb590 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 29 Apr 2016 19:13:17 +0100
Subject: [PATCH 08/14] libxl: Do not trust backend for cdrom insert
Use the /libxl path where appropriate. Rename `path' variable to
`be_path' to make sure we caught all the occurrences.
Specifically, when checking that the device still exists, check the
`frontend' value in /libxl, rather than anything in the backend
directory.
This is part of XSA-178.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 01d41b1..362fb22 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2500,7 +2500,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
int rc, dm_ver;
libxl__device device;
- const char *path, *libxl_path;
+ const char *be_path, *libxl_path;
xs_transaction_t t = XBT_NULL;
char * tmp;
@@ -2561,15 +2561,15 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
if (rc) goto out;
}
- path = libxl__device_backend_path(gc, &device);
+ be_path = libxl__device_backend_path(gc, &device);
libxl_path = libxl__device_libxl_path(gc, &device);
- /* Sanity check: make sure the backend exists before writing here */
- tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", path));
+ /* Sanity check: make sure the device exists before writing here */
+ tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", libxl_path));
if (!tmp)
{
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist",
- libxl__sprintf(gc, "%s/frontend", path));
+ libxl__sprintf(gc, "%s/frontend", libxl_path));
rc = ERROR_FAIL;
goto out;
}
@@ -2593,7 +2593,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk,
rc = libxl__xs_transaction_start(gc, &t);
if (rc) goto out;
- rc = libxl__xs_writev(gc, t, path, kvs);
+ rc = libxl__xs_writev(gc, t, be_path, kvs);
if (rc) goto out;
rc = libxl__xs_writev(gc, t, libxl_path, kvs);
--
1.9.1
|
