提交 57023c0a 编写于 作者: M Martin Kletzander

CVE-2014-8131: Fix possible deadlock and segfault in qemuConnectGetAllDomainStats()

When user doesn't have read access on one of the domains he requested,
the for loop could exit abruptly or continue and override pointer which
pointed to locked object.

This patch fixed two issues at once.  One is that domflags might have
had QEMU_DOMAIN_STATS_HAVE_JOB even when there was no job started (this
is fixed by doing domflags |= QEMU_DOMAIN_STATS_HAVE_JOB only when the
job was acquired and cleaning domflags on every start of the loop.
Second one is that the domain is kept locked when
virConnectGetAllDomainStatsCheckACL() fails and continues the loop when
it didn't end.  Adding a simple virObjectUnlock() and clearing the
pointer ought to do.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
上级 ab871550
......@@ -18740,20 +18740,23 @@ qemuConnectGetAllDomainStats(virConnectPtr conn,
privflags |= QEMU_DOMAIN_STATS_HAVE_JOB;
for (i = 0; i < ndoms; i++) {
domflags = privflags;
virDomainStatsRecordPtr tmp = NULL;
domflags = 0;
if (!(dom = qemuDomObjFromDomain(doms[i])))
continue;
if (doms != domlist &&
!virConnectGetAllDomainStatsCheckACL(conn, dom->def))
!virConnectGetAllDomainStatsCheckACL(conn, dom->def)) {
virObjectUnlock(dom);
dom = NULL;
continue;
}
if (HAVE_JOB(domflags) &&
if (HAVE_JOB(privflags) &&
qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) < 0)
/* As it was never requested. Gather as much as possible anyway. */
domflags &= ~QEMU_DOMAIN_STATS_HAVE_JOB;
domflags |= QEMU_DOMAIN_STATS_HAVE_JOB;
if (qemuDomainGetStats(conn, dom, stats, &tmp, domflags) < 0)
goto endjob;
......@@ -18761,10 +18764,13 @@ qemuConnectGetAllDomainStats(virConnectPtr conn,
if (tmp)
tmpstats[nstats++] = tmp;
if (HAVE_JOB(domflags) && !qemuDomainObjEndJob(driver, dom)) {
if (HAVE_JOB(domflags)) {
domflags = 0;
if (!qemuDomainObjEndJob(driver, dom)) {
dom = NULL;
continue;
}
}
virObjectUnlock(dom);
dom = NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册