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

qmemman: refresh domain list holding global_lock

Browse Source 
Retrieve a domain list only after obtaining global lock. Otherwise an
outdated list may be used, when a domain was introduced in the meantime
(starting a new domain is done with global lock held), leading to #1389.

QubesOS/qubes-issues#1389
This commit is contained in:
Marek Marczykowski-Górecki 2016-01-14 04:34:53 +01:00
parent caa75cbc18
commit 411e8b5323
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmemman/qmemman_server.py
View File

@ -73,9 +73,12 @@ class XS_Watcher:
def domain_list_changed(self, param):
self.log.debug('domain_list_changed(param={!r})'.format(param))
self.log.debug('acquiring global_lock')
global_lock.acquire()
self.log.debug('global_lock acquired')
try:
curr = self.handle.ls('', '/local/domain')
if curr == None:
if curr is None:
return
# check if domain is really there, it may happen that some empty
@ -87,13 +90,8 @@ class XS_Watcher:
) is not None,
curr
)
self.log.debug('curr={!r}'.format(curr))
self.log.debug('acquiring global_lock')
global_lock.acquire()
self.log.debug('global_lock acquired')
try:
for i in only_in_first_list(curr, self.watch_token_dict.keys()):
# new domain has been created
watch = WatchType(XS_Watcher.meminfo_changed, i)