提交 3e6839d4 编写于 作者: M Michal Privoznik

qemuSecurityRestoreAllLabel: Don't use transactions

Because of the nature of security driver transactions, it is
impossible to use them properly. The thing is, transactions enter
the domain namespace and commit all the seclabel changes.
However, in RestoreAllLabel() this is impossible - the qemu
process, the only process running in the namespace, is gone. And
thus is the namespace. Therefore we shouldn't use the transactions
as there is no namespace to enter.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 0a465238
...@@ -73,22 +73,15 @@ qemuSecurityRestoreAllLabel(virQEMUDriverPtr driver, ...@@ -73,22 +73,15 @@ qemuSecurityRestoreAllLabel(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
bool migrated) bool migrated)
{ {
if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && /* In contrast to qemuSecuritySetAllLabel, do not use
virSecurityManagerTransactionStart(driver->securityManager) < 0) * secdriver transactions here. This function is called from
goto cleanup; * qemuProcessStop() which is meant to do cleanup after qemu
* process died. If it did do, the namespace is gone as qemu
if (virSecurityManagerRestoreAllLabel(driver->securityManager, * was the only process running there. We would not succeed
* in entering the namespace then. */
virSecurityManagerRestoreAllLabel(driver->securityManager,
vm->def, vm->def,
migrated) < 0) migrated);
goto cleanup;
if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) &&
virSecurityManagerTransactionCommit(driver->securityManager,
vm->pid) < 0)
goto cleanup;
cleanup:
virSecurityManagerTransactionAbort(driver->securityManager);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册