summaryrefslogtreecommitdiffstats
path: root/security/apparmor/include/label.h
diff options
context:
space:
mode:
authorJohn Johansen2017-08-01 02:36:45 +0200
committerJohn Johansen2018-05-02 09:48:55 +0200
commitc092921219d227b13cb80dbecd3545ee66ab89b3 (patch)
tree9047e3ecae86ec35208de3a2f60ed31f3c7a3e1b /security/apparmor/include/label.h
parentMerge tag 'v4.17-rc3' into apparmor-next (diff)
downloadkernel-qcow2-linux-c092921219d227b13cb80dbecd3545ee66ab89b3.tar.gz
kernel-qcow2-linux-c092921219d227b13cb80dbecd3545ee66ab89b3.tar.xz
kernel-qcow2-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/include/label.h')
-rw-r--r--security/apparmor/include/label.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/include/label.h b/security/apparmor/include/label.h
index d871e7ff0952..7ce5fe73ae7f 100644
--- a/security/apparmor/include/label.h
+++ b/security/apparmor/include/label.h
@@ -281,7 +281,7 @@ void __aa_labelset_update_subtree(struct aa_ns *ns);
void aa_label_free(struct aa_label *label);
void aa_label_kref(struct kref *kref);
-bool aa_label_init(struct aa_label *label, int size);
+bool aa_label_init(struct aa_label *label, int size, gfp_t gfp);
struct aa_label *aa_label_alloc(int size, struct aa_proxy *proxy, gfp_t gfp);
bool aa_label_is_subset(struct aa_label *set, struct aa_label *sub);