openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virt-aa-helper: resolve file symlinks 

In a recent change b932ed69: "virt-aa-helper: resolve yet to be created
paths" several cases with symlinks in paths were fixed, but it regressed
cases where the file being last element of the path was the actual link.

In the case of the last element being the symlink realpath can (and shall)
be called on the full path that was passed.

Examples would be zfs/lvm block devices like:
 <disk type='block' device='disk'>
    <driver name='qemu' type='raw'/>
    <source dev='/dev/mapper/testlvm-testvol1'/>
    <target dev='vdd' bus='virtio'/>
 </disk>
With the target being:
 /dev/mapper/testlvm-testvol1 -> ../dm-0

That currently is rendered as
 "/dev/mapper/testlvm-testvol1" rwk,
but instead should be (and is with the fix):
 "/dev/dm-0" rwk,

Fixes: b932ed69: "virt-aa-helper: resolve yet to be created paths"
Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1756394

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
This commit is contained in:
Christian Ehrhardt 2018-03-19 11:10:29 +01:00 committed by Michal Privoznik
parent 7e476356c2
commit 77cd862fb5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/security/virt-aa-helper.c
View File

@ -777,7 +777,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi
* 3. re-combine the realpath with the remaining suffix * 3. re-combine the realpath with the remaining suffix
* Note: A totally non existent path is used as-is * Note: A totally non existent path is used as-is
*/ */
if ((pathdir = mdir_name(path)) == NULL) if (VIR_STRDUP_QUIET(pathdir, path) < 0)
goto cleanup; goto cleanup;
while (!virFileExists(pathdir)) { while (!virFileExists(pathdir)) {
if ((pathtmp = mdir_name(pathdir)) == NULL) if ((pathtmp = mdir_name(pathdir)) == NULL)