From 285748e33594ccaa265c7ecbe38c8a9894e6e859 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Sun, 21 Jan 2024 15:51:46 -0800 Subject: [PATCH] UBUNTU: SAUCE: apparmor4.0.0 [65/90] v6.8 prompt:fixup interruptible BugLink: http://bugs.launchpad.net/bugs/2028253 (cherry picked from commit c1a3d39f39337a36a0123f3f34e2ecc1ad0bdede https://git.launchpad.net/~apparmor-dev/ubuntu-kernel-next) Signed-off-by: Paolo Pisati --- security/apparmor/apparmorfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index b9f5394de31c..e5e728c36d3f 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -2554,6 +2554,7 @@ static struct aa_sfs_entry aa_sfs_entry_domain[] = { AA_SFS_FILE_BOOLEAN("post_nnp_subset", 1), AA_SFS_FILE_BOOLEAN("computed_longest_left", 1), AA_SFS_DIR("attach_conditions", aa_sfs_entry_attach), + AA_SFS_FILE_BOOLEAN("interruptible", 1), AA_SFS_FILE_BOOLEAN("disconnected.path", 1), AA_SFS_FILE_STRING("version", "1.2"), { } @@ -2573,11 +2574,10 @@ static struct aa_sfs_entry aa_sfs_entry_versions[] = { { } }; -static struct aa_sfs_entry aa_sfs_entry_profile[] = { - AA_SFS_FILE_BOOLEAN("interruptible", 1), - { } -}; - +/* permstable v1: skipped + v2: accept1 index, no accept2 + v3: accept1 index, accept2 flags +*/ #define PERMS32STR "allow deny subtree cond kill complain prompt audit quiet hide xindex tag label" static struct aa_sfs_entry aa_sfs_entry_policy[] = { AA_SFS_DIR("versions", aa_sfs_entry_versions),