[libvirt] [PATCH 29/30] security: selinux: break out SetImageLabelRelative
Daniel Henrique Barboza
danielhb413 at gmail.com
Thu Oct 10 16:09:43 UTC 2019
On 10/7/19 6:49 PM, Cole Robinson wrote:
> This will be used for recursing into externalDataStore
>
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
> src/security/security_selinux.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index c0bfb581e3..feb703d325 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -1919,15 +1919,16 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
>
>
> static int
> -virSecuritySELinuxSetImageLabel(virSecurityManagerPtr mgr,
> - virDomainDefPtr def,
> - virStorageSourcePtr src,
> - virSecurityDomainImageLabelFlags flags)
> +virSecuritySELinuxSetImageLabelRelative(virSecurityManagerPtr mgr,
> + virDomainDefPtr def,
> + virStorageSourcePtr src,
> + virStorageSourcePtr parent,
> + virSecurityDomainImageLabelFlags flags)
> {
> virStorageSourcePtr n;
>
> for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
> - if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, src) < 0)
> + if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent) < 0)
> return -1;
>
> if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
> @@ -1938,6 +1939,15 @@ virSecuritySELinuxSetImageLabel(virSecurityManagerPtr mgr,
> }
>
>
> +static int
> +virSecuritySELinuxSetImageLabel(virSecurityManagerPtr mgr,
> + virDomainDefPtr def,
> + virStorageSourcePtr src,
> + virSecurityDomainImageLabelFlags flags)
> +{
> + return virSecuritySELinuxSetImageLabelRelative(mgr, def, src, src, flags);
> +}
> +
> struct virSecuritySELinuxMoveImageMetadataData {
> virSecurityManagerPtr mgr;
> const char *src;
More information about the libvir-list
mailing list