Merge remote-tracking branch 'jchittum/backport-apparmor65-lp2037567' into ubuntu/jammy

1 year ago · ea630ac812
parent e9548a4984 3cec0a6714
commit ea630ac812
37 changed files with 43 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
+livecd-rootfs (2.765.31) UNRELEASED; urgency=medium
+
+  * fix: add 6.5 kernel appamor features to livecd-rootfs based on
+    features of 6.5 in ubuntu/mantic. This will rolle as HWE (LP: #2037567)
+
+ -- jchittum <john.chittum@canonical.com>  Thu, 19 Oct 2023 07:22:41 -0500
+
 livecd-rootfs (2.765.30) jammy; urgency=medium

  * Enable snap preseeding with ppc64el images where /boot/vmlinux is used
--- a/live-build/apparmor/6.5/capability
+++ b/live-build/apparmor/6.5/capability
@ -0,0 +1 @@
+0xffffff
--- a/live-build/apparmor/6.5/caps/mask
+++ b/live-build/apparmor/6.5/caps/mask
@ -0,0 +1 @@
+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 perfmon bpf checkpoint_restore
--- a/live-build/apparmor/6.5/dbus/mask
+++ b/live-build/apparmor/6.5/dbus/mask
@ -0,0 +1 @@
+acquire send receive
--- a/live-build/apparmor/6.5/domain/attach_conditions/xattr
+++ b/live-build/apparmor/6.5/domain/attach_conditions/xattr
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/change_hat
+++ b/live-build/apparmor/6.5/domain/change_hat
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/change_hatv
+++ b/live-build/apparmor/6.5/domain/change_hatv
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/change_onexec
+++ b/live-build/apparmor/6.5/domain/change_onexec
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/change_profile
+++ b/live-build/apparmor/6.5/domain/change_profile
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/computed_longest_left
+++ b/live-build/apparmor/6.5/domain/computed_longest_left
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/fix_binfmt_elf_mmap
+++ b/live-build/apparmor/6.5/domain/fix_binfmt_elf_mmap
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/post_nnp_subset
+++ b/live-build/apparmor/6.5/domain/post_nnp_subset
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/stack
+++ b/live-build/apparmor/6.5/domain/stack
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/domain/version
+++ b/live-build/apparmor/6.5/domain/version
@ -0,0 +1 @@
+1.2
--- a/live-build/apparmor/6.5/file/mask
+++ b/live-build/apparmor/6.5/file/mask
@ -0,0 +1 @@
+create read write exec append mmap_exec link lock
--- a/live-build/apparmor/6.5/io_uring/mask
+++ b/live-build/apparmor/6.5/io_uring/mask
@ -0,0 +1 @@
+sqpoll override_creds
--- a/live-build/apparmor/6.5/ipc/posix_mqueue
+++ b/live-build/apparmor/6.5/ipc/posix_mqueue
@ -0,0 +1 @@
+create read write open delete setattr getattr
--- a/live-build/apparmor/6.5/mount/mask
+++ b/live-build/apparmor/6.5/mount/mask
@ -0,0 +1 @@
+mount umount pivot_root
--- a/live-build/apparmor/6.5/namespaces/mask
+++ b/live-build/apparmor/6.5/namespaces/mask
@ -0,0 +1 @@
+userns_create
--- a/live-build/apparmor/6.5/namespaces/pivot_root
+++ b/live-build/apparmor/6.5/namespaces/pivot_root
@ -0,0 +1 @@
+no
--- a/live-build/apparmor/6.5/namespaces/profile
+++ b/live-build/apparmor/6.5/namespaces/profile
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/network/af_mask
+++ b/live-build/apparmor/6.5/network/af_mask
@ -0,0 +1 @@
+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 kcm qipcrtr smc xdp mctp
--- a/live-build/apparmor/6.5/network/af_unix
+++ b/live-build/apparmor/6.5/network/af_unix
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/network_v8/af_mask
+++ b/live-build/apparmor/6.5/network_v8/af_mask
@ -0,0 +1 @@
+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 kcm qipcrtr smc xdp mctp
--- a/live-build/apparmor/6.5/policy/outofband
+++ b/live-build/apparmor/6.5/policy/outofband
@ -0,0 +1 @@
+0x000001
--- a/live-build/apparmor/6.5/policy/set_load
+++ b/live-build/apparmor/6.5/policy/set_load
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/policy/versions/v5
+++ b/live-build/apparmor/6.5/policy/versions/v5
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/policy/versions/v6
+++ b/live-build/apparmor/6.5/policy/versions/v6
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/policy/versions/v7
+++ b/live-build/apparmor/6.5/policy/versions/v7
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/policy/versions/v8
+++ b/live-build/apparmor/6.5/policy/versions/v8
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/policy/versions/v9
+++ b/live-build/apparmor/6.5/policy/versions/v9
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/ptrace/mask
+++ b/live-build/apparmor/6.5/ptrace/mask
@ -0,0 +1 @@
+read trace
--- a/live-build/apparmor/6.5/query/label/data
+++ b/live-build/apparmor/6.5/query/label/data
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/query/label/multi_transaction
+++ b/live-build/apparmor/6.5/query/label/multi_transaction
@ -0,0 +1 @@
+yes
--- a/live-build/apparmor/6.5/query/label/perms
+++ b/live-build/apparmor/6.5/query/label/perms
@ -0,0 +1 @@
+allow deny audit quiet
--- a/live-build/apparmor/6.5/rlimit/mask
+++ b/live-build/apparmor/6.5/rlimit/mask
@ -0,0 +1 @@
+cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime
--- a/live-build/apparmor/6.5/signal/mask
+++ b/live-build/apparmor/6.5/signal/mask
@ -0,0 +1 @@
+hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost
				`@ -0,0 +1 @@`
				`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 perfmon bpf checkpoint_restore`
				`@ -0,0 +1 @@`
				`create read write exec append mmap_exec link lock`
				`@ -0,0 +1 @@`
				`create read write open delete setattr getattr`
				`@ -0,0 +1 @@`
				`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 kcm qipcrtr smc xdp mctp`
				`@ -0,0 +1 @@`
				`cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime`
				`@ -0,0 +1 @@`
				`hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost`