summaryrefslogtreecommitdiffstats
path: root/security/apparmor/include/context.h
diff options
context:
space:
mode:
Diffstat (limited to 'security/apparmor/include/context.h')
-rw-r--r--security/apparmor/include/context.h40
1 files changed, 1 insertions, 39 deletions
diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
index b2aeb1da7e77..e287b7d0d4be 100644
--- a/security/apparmor/include/context.h
+++ b/security/apparmor/include/context.h
@@ -21,33 +21,10 @@
#include "label.h"
#include "policy_ns.h"
+#include "task.h"
-#define task_ctx(X) ((X)->security)
-#define current_task_ctx() (task_ctx(current))
#define cred_label(X) ((X)->security)
-/*
- * struct aa_task_ctx - information for current task label change
- * @onexec: profile to transition to on next exec (MAY BE NULL)
- * @previous: profile the task may return to (MAY BE NULL)
- * @token: magic value the task must know for returning to @previous_profile
- */
-struct aa_task_ctx {
- struct aa_label *onexec;
- struct aa_label *previous;
- u64 token;
-};
-
-struct aa_task_ctx *aa_alloc_task_ctx(gfp_t flags);
-void aa_free_task_ctx(struct aa_task_ctx *ctx);
-void aa_dup_task_ctx(struct aa_task_ctx *new, const struct aa_task_ctx *old);
-
-int aa_replace_current_label(struct aa_label *label);
-int aa_set_current_onexec(struct aa_label *label, bool stack);
-int aa_set_current_hat(struct aa_label *label, u64 token);
-int aa_restore_previous_label(u64 cookie);
-struct aa_label *aa_get_task_label(struct task_struct *task);
-
/**
* aa_cred_raw_label - obtain cred's label
@@ -196,19 +173,4 @@ static inline struct aa_ns *aa_get_current_ns(void)
return ns;
}
-/**
- * aa_clear_task_ctx_trans - clear transition tracking info from the ctx
- * @ctx: task context to clear (NOT NULL)
- */
-static inline void aa_clear_task_ctx_trans(struct aa_task_ctx *ctx)
-{
- AA_BUG(!ctx);
-
- aa_put_label(ctx->previous);
- aa_put_label(ctx->onexec);
- ctx->previous = NULL;
- ctx->onexec = NULL;
- ctx->token = 0;
-}
-
#endif /* __AA_CONTEXT_H */