UBUNTU: SAUCE: LSM stacking: fixup: alloc_task_ctx is dead code

BugLink: http://bugs.launchpad.net/bugs/1763062
Fixes: 7b27ec622c90 ("LSM: manage credential security blobs)
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/security/apparmor/context.c b/security/apparmor/context.c
index db203ee24db8963ceb344c82adcef85d3f9ebe2a..8956da14b4623ad76fa0b929d9cafc5476219723 100644 (file)
--- a/security/apparmor/context.c
+++ b/security/apparmor/context.c
@@ -29,16 +29,6 @@
 #include "include/context.h"
 #include "include/policy.h"
 
-/**
- * aa_alloc_task_context - allocate a new task_ctx
- * @flags: gfp flags for allocation
- *
- * Returns: allocated buffer or NULL on failure
- */
-struct aa_task_ctx *aa_alloc_task_context(gfp_t flags)
-{
-       return kzalloc(sizeof(struct aa_task_ctx), flags);
-}
 
 /**
  * aa_free_task_context - free a task_ctx

diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
index c6d5dbbd18b01ede369eb523524c8154321fe436..349ea30882677ddebc0b37289f35fe3a70aff687 100644 (file)
--- a/security/apparmor/include/context.h
+++ b/security/apparmor/include/context.h
@@ -45,7 +45,6 @@ struct aa_task_ctx {
        u64 token;
 };
 
-struct aa_task_ctx *aa_alloc_task_context(gfp_t flags);
 void aa_free_task_context(struct aa_task_ctx *ctx);
 void aa_dup_task_context(struct aa_task_ctx *new,
                         const struct aa_task_ctx *old);