openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

storage: Fix returning of locked objects from 'virStoragePoolObjListSearch' 

CVE-2023-3750

'virStoragePoolObjListSearch' explicitly documents that it's returning
a pointer to a locked and ref'd pool that maches the lookup function.

This was not the case as in commit 0c4b391e2a (released in
libvirt-8.3.0) the code was accidentally converted to use 'VIR_LOCK_GUARD'
which auto-unlocked it when leaving the scope, even when the code was
originally "leaking" the lock.

Revert the corresponding conversion and add a comment that this function
is intentionally leaking a locked object.

Fixes: 0c4b391e2a
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2221851
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: zeng_chi <zengchi@kylinos.cn>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-07-13 16:16:37 +02:00 committed by zengchi
parent e3770f2cd8
commit 87ecdf0329
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/virstorageobj.c
View File

@ -454,11 +454,16 @@ virStoragePoolObjListSearchCb(const void *payload,
virStoragePoolObj *obj = (virStoragePoolObj *) payload; virStoragePoolObj *obj = (virStoragePoolObj *) payload;
struct _virStoragePoolObjListSearchData *data = struct _virStoragePoolObjListSearchData *data =
(struct _virStoragePoolObjListSearchData *)opaque; (struct _virStoragePoolObjListSearchData *)opaque;
VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
virObjectLock(obj);
/* If we find the matching pool object we must return while the object is
* locked as the caller wants to return a locked object. */
if (data->searcher(obj, data->opaque)) if (data->searcher(obj, data->opaque))
return 1; return 1;
virObjectUnlock(obj);
return 0; return 0;
} }