mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
storage: Fix path check in storagePoolLookupByTargetPath
Commit id '5ab746b8' introduced the function as perhaps a copy of storageVolLookupByPath; however, it did not use the @cleanpath variable even though it used the virFileSanitizePath. So in essance the only "check" being done for failure is whether it was possible to strdup the path. Looking at the virStoragePoolDefParseXML one will note that the target.path is stored using the result of virFileSanitizePath. Therefore, this function should sanitize and use the input @path for the argument to storagePoolLookupByTargetPathCallback which is comparing against stored target.path values. Additionally, if there was an error we should use the proper error of VIR_ERR_NO_STORAGE_POOL (instead of VIR_ERR_NO_STORAGE_VOL).
This commit is contained in:
parent
4199c2f221
commit
d4f80d439e
@ -1667,7 +1667,7 @@ storagePoolLookupByTargetPath(virConnectPtr conn,
|
||||
storageDriverLock();
|
||||
if ((obj = virStoragePoolObjListSearch(&driver->pools,
|
||||
storagePoolLookupByTargetPathCallback,
|
||||
path))) {
|
||||
cleanpath))) {
|
||||
def = virStoragePoolObjGetDef(obj);
|
||||
pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL);
|
||||
virStoragePoolObjEndAPI(&obj);
|
||||
@ -1675,9 +1675,15 @@ storagePoolLookupByTargetPath(virConnectPtr conn,
|
||||
storageDriverUnlock();
|
||||
|
||||
if (!pool) {
|
||||
virReportError(VIR_ERR_NO_STORAGE_VOL,
|
||||
_("no storage pool with matching target path '%s'"),
|
||||
path);
|
||||
if (STREQ(path, cleanpath)) {
|
||||
virReportError(VIR_ERR_NO_STORAGE_POOL,
|
||||
_("no storage pool with matching target path '%s'"),
|
||||
path);
|
||||
} else {
|
||||
virReportError(VIR_ERR_NO_STORAGE_POOL,
|
||||
_("no storage pool with matching target path '%s' (%s)"),
|
||||
path, cleanpath);
|
||||
}
|
||||
}
|
||||
|
||||
VIR_FREE(cleanpath);
|
||||
|
Loading…
Reference in New Issue
Block a user