Teach AppArmor, that /usr/lib64 may exist.

The apparmor profiles forgot about /usr/lib64 folders, just add lib64
as a possible alternative to lib in the paths

diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
index c6de6dd77cf00efa19510c68783e892401a5301a..7aad3911a2d860696da35cfca3857dc2f2918060 100644 (file)
--- a/examples/apparmor/libvirt-qemu
+++ b/examples/apparmor/libvirt-qemu
@@ -111,7 +111,7 @@
   /usr/bin/qemu-sparc32plus rmix,
   /usr/bin/qemu-sparc64 rmix,
   /usr/bin/qemu-x86_64 rmix,
-  /usr/lib/qemu/block-curl.so mr,
+  /usr/{lib,lib64}/qemu/block-curl.so mr,
 
   # for save and resume
   /bin/dash rmix,

diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
index bceaaffdf716f08dc567d36b028e5f2052330784..b34fb353263e373f2844d48c996741ecc878d6bb 100644 (file)
--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -1,7 +1,7 @@
 # Last Modified: Mon Apr  5 15:10:27 2010
 #include <tunables/global>
 
-/usr/lib/libvirt/virt-aa-helper {
+profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
   #include <abstractions/base>
 
   # needed for searching directories
@@ -20,7 +20,7 @@
   /sys/devices/ r,
   /sys/devices/** r,
 
-  /usr/lib/libvirt/virt-aa-helper mr,
+  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
   /sbin/apparmor_parser Ux,
 
   /etc/apparmor.d/libvirt/* r,

diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
index 3011eff3f9b1b9948403b26f150039d527a99287..71510520598d1f21302330d11763e9c192221a4b 100644 (file)
--- a/examples/apparmor/usr.sbin.libvirtd
+++ b/examples/apparmor/usr.sbin.libvirtd
@@ -44,7 +44,7 @@
   /usr/bin/* PUx,
   /usr/sbin/* PUx,
   /lib/udev/scsi_id PUx,
-  /usr/lib/xen-common/bin/xen-toolstack PUx,
+  /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx,
 
   # force the use of virt-aa-helper
   audit deny /sbin/apparmor_parser rwxl,
@@ -53,7 +53,7 @@
   audit deny /sys/kernel/security/apparmor/matching rwxl,
   audit deny /sys/kernel/security/apparmor/.* rwxl,
   /sys/kernel/security/apparmor/profiles r,
-  /usr/lib/libvirt/* PUxr,
+  /usr/{lib,lib64}/libvirt/* PUxr,
   /etc/libvirt/hooks/** rmix,
   /etc/xen/scripts/** rmix,