summaryrefslogtreecommitdiffstats
path: root/security/apparmor/apparmorfs.c
diff options
context:
space:
mode:
authorJohn Johansen2017-06-10 02:29:12 +0200
committerJohn Johansen2017-06-11 02:11:45 +0200
commit5379a3312024a8befe7728238fc50ed05d2938ac (patch)
tree1585b97bf6addcb3452a53a9a028e5c482d46b45 /security/apparmor/apparmorfs.c
parentapparmor: mediate files when they are received (diff)
downloadkernel-qcow2-linux-5379a3312024a8befe7728238fc50ed05d2938ac.tar.gz
kernel-qcow2-linux-5379a3312024a8befe7728238fc50ed05d2938ac.tar.xz
kernel-qcow2-linux-5379a3312024a8befe7728238fc50ed05d2938ac.zip
apparmor: support v7 transition format compatible with label_parse
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
-rw-r--r--security/apparmor/apparmorfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index d1a6ce499776..e460f2d8337d 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -2103,6 +2103,8 @@ static struct aa_sfs_entry aa_sfs_entry_domain[] = {
static struct aa_sfs_entry aa_sfs_entry_versions[] = {
AA_SFS_FILE_BOOLEAN("v5", 1),
+ AA_SFS_FILE_BOOLEAN("v6", 1),
+ AA_SFS_FILE_BOOLEAN("v7", 1),
{ }
};