[libvirt] [PATCH v2] security: apparmor: Label externalDataStore
Teach virt-aa-helper how to label a qcow2 data_file, tracked internally as externalDataStore. It should be treated the same as its sibling disk image Signed-off-by: Cole Robinson <crobinso@redhat.com> --- v2: s/src/tmp/ src/security/virt-aa-helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c93dddb228..f623ff965f 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -918,6 +918,10 @@ storage_source_add_files(virStorageSourcePtr src, if (add_file_path(tmp, depth, buf) < 0) return -1; + if (tmp->externalDataStore && + storage_source_add_files(tmp->externalDataStore, buf, depth) < 0) + return -1; + depth++; } -- 2.23.0
On Tue, Dec 10, 2019 at 1:54 AM Cole Robinson <crobinso@redhat.com> wrote:
Teach virt-aa-helper how to label a qcow2 data_file, tracked internally as externalDataStore. It should be treated the same as its sibling disk image
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Now LGTM, thanks for the rework. And after Peters explanation (thanks) I agree that it is the right approach to do it inside the loop. Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
--- v2: s/src/tmp/
src/security/virt-aa-helper.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c93dddb228..f623ff965f 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -918,6 +918,10 @@ storage_source_add_files(virStorageSourcePtr src, if (add_file_path(tmp, depth, buf) < 0) return -1;
+ if (tmp->externalDataStore && + storage_source_add_files(tmp->externalDataStore, buf, depth) < 0) + return -1; + depth++; }
-- 2.23.0
-- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd
participants (2)
-
Christian Ehrhardt -
Cole Robinson