External/libvirt
1
0
Fork 0
Code

qemuProcessReconnect: clear 'oldjob'

Browse Source 
After we started copying the privateData pointer in
qemuDomainObjRestoreJob, we should also free them
once we're done with them.

Register the clear function and use g_auto.
Also add a check for job->cb to qemuDomainObjClearJob,
to prevent freeing an uninitialized job.

https://bugzilla.redhat.com/show_bug.cgi?id=1878450

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Fixes: aca37c3fb2e8d733c2788ca4b796c153ea7ce391
This commit is contained in:
Ján Tomko 2020-09-14 13:29:23 +02:00
parent a3c340e05f
commit af16e754cd
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_domainjob.c
View File

@ -248,6 +248,9 @@ qemuDomainObjRestoreJob(virDomainObjPtr obj,
void void
qemuDomainObjClearJob(qemuDomainJobObjPtr job) qemuDomainObjClearJob(qemuDomainJobObjPtr job)
{ {
if (!job->cb)
return;
qemuDomainObjResetJob(job); qemuDomainObjResetJob(job);
qemuDomainObjResetAsyncJob(job); qemuDomainObjResetAsyncJob(job);
g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); g_clear_pointer(&job->privateData, job->cb->freeJobPrivate);

1
src/qemu/qemu_domainjob.h
View File

@ -275,6 +275,7 @@ int qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo,
bool qemuDomainTrackJob(qemuDomainJob job); bool qemuDomainTrackJob(qemuDomainJob job);
void qemuDomainObjClearJob(qemuDomainJobObjPtr job); void qemuDomainObjClearJob(qemuDomainJobObjPtr job);
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(qemuDomainJobObj, qemuDomainObjClearJob);
int int
qemuDomainObjInitJob(qemuDomainJobObjPtr job, qemuDomainObjInitJob(qemuDomainJobObjPtr job,

4
src/qemu/qemu_process.c
View File

@ -8081,7 +8081,9 @@ qemuProcessReconnect(void *opaque)
virQEMUDriverPtr driver = data->driver; virQEMUDriverPtr driver = data->driver;
virDomainObjPtr obj = data->obj; virDomainObjPtr obj = data->obj;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
qemuDomainJobObj oldjob; g_auto(qemuDomainJobObj) oldjob = {
.cb = NULL,
};
int state; int state;
int reason; int reason;
g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL;