From: Serge Hallyn Date: Fri, 10 Apr 2015 20:21:03 +0000 (+0000) Subject: virt-aa-helper: add unix channels (esp for qemu-guest-agent) X-Git-Tag: v1.2.15-rc1~192 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d7462d;p=thirdparty%2Flibvirt.git virt-aa-helper: add unix channels (esp for qemu-guest-agent) The original bug report was at https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1393842 Also skip abstract unix sockets. Signed-off-by: Serge Hallyn Signed-off-by: Ján Tomko --- diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e53779e3a7..5a070d738c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -998,8 +998,10 @@ get_files(vahControl * ctl) (ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE || + ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) && - ctl->def->channels[i]->source.data.file.path) + ctl->def->channels[i]->source.data.file.path && + ctl->def->channels[i]->source.data.file.path[0] != '\0') if (vah_add_file_chardev(&buf, ctl->def->channels[i]->source.data.file.path, "rw",