[libvirt] [PATCH] selinux: Don't fail RestoreAll if file doesn't have a default label

[Eric Blake]

On 10/21/2012 02:44 PM, Cole Robinson wrote:
> When restoring selinux labels after a VM is stopped, any non-standard
> path that doesn't have a default selinux label causes the process
> to stop and exit early. This isn't really an error condition IMO.
> 
> Of course the selinux API could be erroring for some other reason
> but hopefully that's rare enough to not need explicit handling.
> 
> Common example here is storing disk images in a non-standard location
> like under /mnt.
> ---
>  src/security/security_selinux.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index eee8d71..7681f1b 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -936,7 +936,11 @@ virSecuritySELinuxRestoreSecurityFileLabel(const char *path)
>      }
>  
>      if (getContext(newpath, buf.st_mode, &fcon) < 0) {
> +        /* Any user created path likely does not have a default label,
> +         * which makes this an expected non error
> +         */
>          VIR_WARN("cannot lookup default selinux label for %s", newpath);
> +        rc = 0;

In the case where there is no default label to restore, shouldn't we
still be removing our sVirt label rather than just ignoring the failure
but leaving our label intact?

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 617 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20121022/6cdbc70e/attachment-0001.sig>