[libvirt] [PATCH 4/7] security: apparmor: Pass virStorageSource to add_file_path
The virStorageSource must have everything it needs
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/security/virt-aa-helper.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 7148e3c760..9f39eb2e2b 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -911,20 +911,19 @@ file_iterate_pci_cb(virPCIDevicePtr dev ATTRIBUTE_UNUSED,
}
static int
-add_file_path(virDomainDiskDefPtr disk,
- const char *path,
+add_file_path(virStorageSourcePtr src,
size_t depth,
virBufferPtr buf)
{
int ret;
if (depth == 0) {
- if (disk->src->readonly)
- ret = vah_add_file(buf, path, "rk");
+ if (src->readonly)
+ ret = vah_add_file(buf, src->path, "rk");
else
- ret = vah_add_file(buf, path, "rwk");
+ ret = vah_add_file(buf, src->path, "rwk");
} else {
- ret = vah_add_file(buf, path, "rk");
+ ret = vah_add_file(buf, src->path, "rk");
}
if (ret != 0)
@@ -945,7 +944,7 @@ disk_add_files(virDomainDiskDefPtr disk,
/* execute the callback only for local storage */
if (virStorageSourceIsLocalStorage(tmp) &&
tmp->path) {
- if (add_file_path(disk, tmp->path, depth, buf) < 0)
+ if (add_file_path(tmp, depth, buf) < 0)
return -1;
}
--
2.23.0