From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 8 Oct 2019 16:04:57 +0000 (-0400)
Subject: security: apparmor: Use only virStorageSource for disk paths
X-Git-Tag: v5.9.0-rc1~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2b003db742a9013176acb04581a08b2876673f2;p=thirdparty%2Flibvirt.git

security: apparmor: Use only virStorageSource for disk paths

This is closer to what security_selinux.c does, and will help add
support for qcow2 external data_files

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 20281c38b7..b675572144 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -938,13 +938,13 @@ add_file_path(virStorageSourcePtr src,
 
 
 static int
-disk_add_files(virDomainDiskDefPtr disk,
-               virBufferPtr buf)
+storage_source_add_files(virStorageSourcePtr src,
+                         virBufferPtr buf)
 {
     size_t depth = 0;
     virStorageSourcePtr tmp;
 
-    for (tmp = disk->src; virStorageSourceIsBacking(tmp); tmp = tmp->backingStore) {
+    for (tmp = src; virStorageSourceIsBacking(tmp); tmp = tmp->backingStore) {
         if (add_file_path(tmp, depth, buf) < 0)
             return -1;
 
@@ -994,7 +994,7 @@ get_files(vahControl * ctl)
 
          /* XXX should handle open errors more careful than just ignoring them.
          */
-        if (disk_add_files(disk, &buf) < 0)
+        if (storage_source_add_files(disk->src, &buf) < 0)
             goto cleanup;
     }