summaryrefslogtreecommitdiffstats
path: root/security/apparmor/policy.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-08-01 02:36:45 +0200
committerJohn Johansen <john.johansen@canonical.com>2018-05-02 09:48:55 +0200
commitc092921219d227b13cb80dbecd3545ee66ab89b3 (patch)
tree9047e3ecae86ec35208de3a2f60ed31f3c7a3e1b /security/apparmor/policy.c
parentMerge tag 'v4.17-rc3' into apparmor-next (diff)
downloadlinux-c092921219d227b13cb80dbecd3545ee66ab89b3.tar.xz
linux-c092921219d227b13cb80dbecd3545ee66ab89b3.zip
apparmor: add support for mapping secids and using secctxes
Use a radix tree to provide a map between the secid and the label, and along with it a basic ability to provide secctx conversion. Shared/cached secctx will be added later. Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/policy.c')
-rw-r--r--security/apparmor/policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index c07493ce2376..d68252b112dc 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -268,7 +268,7 @@ struct aa_profile *aa_alloc_profile(const char *hname, struct aa_proxy *proxy,
if (!aa_policy_init(&profile->base, NULL, hname, gfp))
goto fail;
- if (!aa_label_init(&profile->label, 1))
+ if (!aa_label_init(&profile->label, 1, gfp))
goto fail;
/* update being set needed by fs interface */