提交 dd78da09 编写于 作者: M Michal Privoznik

qemuDomainCreateDevice: Be more careful about device path

Again, not something that I'd hit, but there is a chance in
theory that this might bite us. Currently the way we decide
whether or not to create /dev entry for a device is by marching
first four characters of path with "/dev". This might be not
enough. Just imagine somebody has a disk image stored under
"/devil/path/to/disk". We ought to be matching against "/dev/".
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 ce01a2b1
...@@ -6917,6 +6917,8 @@ qemuDomainGetHostdevPath(virDomainHostdevDefPtr dev, ...@@ -6917,6 +6917,8 @@ qemuDomainGetHostdevPath(virDomainHostdevDefPtr dev,
} }
#define DEVPREFIX "/dev/"
#if defined(__linux__) #if defined(__linux__)
static int static int
qemuDomainCreateDevice(const char *device, qemuDomainCreateDevice(const char *device,
...@@ -6927,7 +6929,7 @@ qemuDomainCreateDevice(const char *device, ...@@ -6927,7 +6929,7 @@ qemuDomainCreateDevice(const char *device,
struct stat sb; struct stat sb;
int ret = -1; int ret = -1;
if (!STRPREFIX(device, "/dev")) { if (!STRPREFIX(device, DEVPREFIX)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("invalid device: %s"), _("invalid device: %s"),
device); device);
...@@ -6935,7 +6937,7 @@ qemuDomainCreateDevice(const char *device, ...@@ -6935,7 +6937,7 @@ qemuDomainCreateDevice(const char *device,
} }
if (virAsprintf(&devicePath, "%s/%s", if (virAsprintf(&devicePath, "%s/%s",
path, device + 4) < 0) path, device + strlen(DEVPREFIX)) < 0)
goto cleanup; goto cleanup;
if (stat(device, &sb) < 0) { if (stat(device, &sb) < 0) {
...@@ -7066,7 +7068,7 @@ qemuDomainSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, ...@@ -7066,7 +7068,7 @@ qemuDomainSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
for (next = disk->src; next; next = next->backingStore) { for (next = disk->src; next; next = next->backingStore) {
if (!next->path || !virStorageSourceIsLocalStorage(next) || if (!next->path || !virStorageSourceIsLocalStorage(next) ||
!STRPREFIX(next->path, "/dev")) { !STRPREFIX(next->path, DEVPREFIX)) {
/* Not creating device. Just continue. */ /* Not creating device. Just continue. */
continue; continue;
} }
...@@ -7770,7 +7772,7 @@ qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver, ...@@ -7770,7 +7772,7 @@ qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver,
for (next = disk->src; next; next = next->backingStore) { for (next = disk->src; next; next = next->backingStore) {
if (!next->path || !virStorageSourceIsBlockLocal(disk->src) || if (!next->path || !virStorageSourceIsBlockLocal(disk->src) ||
!STRPREFIX(next->path, "/dev")) { !STRPREFIX(next->path, DEVPREFIX)) {
/* Not creating device. Just continue. */ /* Not creating device. Just continue. */
continue; continue;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册