Merge remote-tracking branch 'origin/snapd-support-5.15.y' into HEAD

arch/arm64/configs/snap_support.config

@@ -0,0 +1,7 @@
+CONFIG_LOCALVERSION="-microsoft-snapd"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf,apparmor"

arch/arm64/configs/wsl2_defconfig

@@ -0,0 +1 @@
+../../../Microsoft/config-wsl-arm64

arch/x86/configs/snap_support.config

@@ -0,0 +1,7 @@
+CONFIG_LOCALVERSION="-microsoft-snapd"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf,apparmor"

arch/x86/configs/wsl2_defconfig

@@ -0,0 +1 @@
+../../../Microsoft/config-wsl

security/apparmor/Makefile

@@ -5,7 +5,8 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
 
 apparmor-y := apparmorfs.o audit.o capability.o task.o ipc.o lib.o match.o \
               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
-              resource.o secid.o file.o policy_ns.o label.o mount.o net.o
+              resource.o secid.o file.o policy_ns.o label.o mount.o net.o \
+              af_unix.o
 apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o
 
 clean-files := capability_names.h rlim_names.h net_names.h