[libvirt] [PATCH 1/2] selinux: fix wrong tapfd relablling

[Guannan Ren]

On 10/17/2012 11:32 AM, Guannan Ren wrote:
> It should relabel tapfd of virtual network of type VIR_DOMAIN_NET_TYPE_DIRECT
> rather than VIR_DOMAIN_NET_TYPE_NETWORK and VIR_DOMAIN_NET_TYPE_BRIDGE
> (commit ae368ebfcc4923d0b32e83d4ca96a6f599625785 introduced this bug)
> ---
>   src/qemu/qemu_command.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 239592c..0c0c400 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -5412,10 +5412,6 @@ qemuBuildCommandLine(virConnectPtr conn,
>                       if (tapfd < 0)
>                           goto error;
>   
> -                if (virSecurityManagerSetTapFDLabel(driver->securityManager,
> -                                                    def, tapfd) < 0)
> -                    goto error;
> -
>                       last_good_net = i;
>                       virCommandTransferFD(cmd, tapfd);
>   
> @@ -5429,6 +5425,10 @@ qemuBuildCommandLine(virConnectPtr conn,
>                   if (tapfd < 0)
>                       goto error;
>   
> +                if (virSecurityManagerSetTapFDLabel(driver->securityManager,
> +                                                    def, tapfd) < 0)
> +                    goto error;
> +
>                   last_good_net = i;
>                   virCommandTransferFD(cmd, tapfd);
>   

    The two patches are pushed.

    Guannan