Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-block: fix checking attached status of disk image files

Browse Source 
Libvirt do not show actual block device (loop*) choosen for the device -
only original (file) path. But file path is available in device
description. Please note that VM can provide any description (withing
allowed limits), effectively breaking this check again (hidding the
attachment status). But even without this bug it could do that - by
hidding the whole device from QubesDB.

Fixes QubesOS/qubes-issues#2453
This commit is contained in:
Marek Marczykowski-Górecki 2016-11-23 03:25:03 +01:00
parent 68a116e8a3
commit ba4dec5383
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/qubesutils.py
View File

@ -372,7 +372,9 @@ def block_check_attached(qvmc, device):
"VM '%s'" % (source.get('type'), "VM '%s'" % (source.get('type'),
vm.name) vm.name)
continue continue
if backend_name == device['vm'] and path == device['device']: if backend_name == device['vm'] and (path == device['device']
or not path.startswith('/dev/') and path == device[
'desc']):
return { return {
"frontend": disk.find('target').get('dev'), "frontend": disk.find('target').get('dev'),
"vm": vm} "vm": vm}

1
qvm-tools/qvm-block
View File

@ -87,6 +87,7 @@ def main():
if options.do_file_attach: if options.do_file_attach:
dev = {} dev = {}
(dev['vm'], dev['device']) = args[1].split(":") (dev['vm'], dev['device']) = args[1].split(":")
dev['desc'] = dev['device']
dev['mode'] = 'w' dev['mode'] = 'w'
else: else:
dev_list = block_list(qvm_collection) dev_list = block_list(qvm_collection)