[apparmor] [PATCH] parser: Update features.all file for new kernel features

Tyler Hicks tyhicks at canonical.com
Sat Mar 19 00:44:44 UTC 2016


The audit_read capability, mpls address family, and profile stacking are
all new features advertised by the latest AppArmor kernel features file.

Without this change, the parser tests will fail because parsing profiles
that utilize stacking results in an error when the features file
indicates that stacking is not supported by the kernel.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 parser/tst/features_files/features.all | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/parser/tst/features_files/features.all b/parser/tst/features_files/features.all
index 381c313..3c9813f 100644
--- a/parser/tst/features_files/features.all
+++ b/parser/tst/features_files/features.all
@@ -7,7 +7,7 @@ signal {mask {hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm t
 ptrace {mask {read trace
 }
 }
-caps {mask {chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend
+caps {mask {chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read
 }
 }
 rlimit {mask {cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime
@@ -25,13 +25,15 @@ mount {mask {mount umount
 }
 network {af_unix {yes
 }
-af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock
+af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock
 }
 }
 file {mask {create read write exec append mmap_exec link lock
 }
 }
-domain {change_profile {yes
+domain {stack {yes
+}
+change_profile {yes
 }
 change_onexec {yes
 }
-- 
2.7.3




More information about the AppArmor mailing list